diff --git a/gradle.properties b/gradle.properties
index f5e694072abf..5da5802fcb77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
 
 # Enable Gradle caching
 org.gradle.configuration-cache=true
-org.gradle.caching=true
+# org.gradle.caching=true -- TODO disable until 'org.web3j.solidity' is compatible
 
 # Enable parallel workers
 org.gradle.parallel=true
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index 9237bbedcb97..69862b30dbe9 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -38,4 +38,5 @@ dependencies {
     implementation("org.gradlex:extra-java-module-info:1.8")
     implementation("org.gradlex:jvm-dependency-conflict-resolution:2.0")
     implementation("org.gradlex:java-module-dependencies:1.6.5")
+    implementation("org.web3j.solidity:solidity-gradle-plugin:0.5.0")
 }
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/tasks/GitClone.kt b/gradle/plugins/src/main/kotlin/com/hedera/gradle/tasks/GitClone.kt
index 343318a1a996..5c39f8b48e56 100644
--- a/gradle/plugins/src/main/kotlin/com/hedera/gradle/tasks/GitClone.kt
+++ b/gradle/plugins/src/main/kotlin/com/hedera/gradle/tasks/GitClone.kt
@@ -56,12 +56,7 @@ abstract class GitClone : DefaultTask() {
             exec.exec {
                 if (!localClone.dir(".git").asFile.exists()) {
                     workingDir = localClone.asFile.parentFile
-                    commandLine(
-                        "git",
-                        "clone",
-                        "https://github.com/hashgraph/hedera-protobufs.git",
-                        "-q"
-                    )
+                    commandLine("git", "clone", url.get(), "-q")
                 } else {
                     workingDir = localClone.asFile
                     commandLine("git", "fetch", "-q")
diff --git a/hedera-node/test-clients/build.gradle.kts b/hedera-node/test-clients/build.gradle.kts
index c51d1bae527a..50644ec2adf0 100644
--- a/hedera-node/test-clients/build.gradle.kts
+++ b/hedera-node/test-clients/build.gradle.kts
@@ -15,10 +15,17 @@
  */
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.hedera.gradle.tasks.GitClone
+import org.web3j.solidity.gradle.plugin.EVMVersion
+import org.web3j.solidity.gradle.plugin.OutputComponent
+import org.web3j.solidity.gradle.plugin.SolidityCompile
+import org.web3j.solidity.gradle.plugin.SolidityResolve
+import org.web3j.solidity.gradle.plugin.SoliditySourceSet
 
 plugins {
     id("com.hedera.gradle.services")
     id("com.hedera.gradle.shadow-jar")
+    id("org.web3j.solidity")
 }
 
 description = "Hedera Services Test Clients for End to End Tests (EET)"
@@ -34,6 +41,61 @@ mainModuleInfo {
     runtimeOnly("org.junit.platform.launcher")
 }
 
+// Clone 'hedera-smart-contracts' to obtain system contracts
+val cloneSmartContracts =
+    tasks.register<GitClone>("cloneSmartContracts") {
+        offline = gradle.startParameter.isOffline
+        url = "https://github.com/hashgraph/hedera-smart-contracts.git"
+        localCloneDirectory = layout.buildDirectory.dir("hedera-smart-contracts")
+        tag = "v0.9.0"
+    }
+
+// General solidity configuration
+solidity {
+    setCombinedOutputComponents()
+    setOutputComponents(OutputComponent.BIN, OutputComponent.ABI)
+    // evmVersion = EVMVersion.CANCUN
+    // prettyJson = true --- does not work due to bug in plugin
+    optimize = false
+    allowPaths.add(layout.projectDirectory.dir("src/main/solidity").asFile.absolutePath)
+    allowPaths.add(
+        layout.buildDirectory
+            .dir("hedera-smart-contracts/contracts/system-contracts")
+            .get()
+            .asFile
+            .absolutePath
+    )
+}
+
+sourceSets.main {
+    withConvention(SoliditySourceSet::class) {
+        solidity {
+            destinationDirectory = layout.buildDirectory.dir("generated/solidity")
+            // TODO remove this filtering and make all 'sol' files compile
+            include("AbandoningParent/*")
+            include("AddressValueRet/*")
+            include("AutoCreationModes/*")
+            include("Child/*")
+            include("Placeholder/*")
+            include("Returner/*")
+            include("AssociateTryCatch/*")
+        }
+    }
+}
+
+tasks.withType<SolidityResolve>().configureEach {
+    inputs.dir(cloneSmartContracts.flatMap { it.localCloneDirectory })
+}
+
+tasks.withType<SolidityCompile>().configureEach {
+    inputs.dir(cloneSmartContracts.flatMap { it.localCloneDirectory })
+}
+
+tasks.processResources { from(tasks.named("compileSolidity")) { into("contract/contracts") } }
+
+// TODO register separate SolidityCompile - complete configuration of task
+tasks.register<SolidityCompile>("compileSolidityParis") { evmVersion = EVMVersion.PARIS }
+
 sourceSets {
     // Needed because "resource" directory is misnamed. See
     // https://github.com/hashgraph/hedera-services/issues/3361
diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/Utils.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/Utils.java
index c5246d3d075d..81dc2f85fe87 100644
--- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/Utils.java
+++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/Utils.java
@@ -79,11 +79,11 @@
 import org.json.JSONTokener;
 
 public class Utils {
-    public static final String RESOURCE_PATH = "src/main/resource/contract/contracts/%1$s/%1$s%2$s";
+    public static final String RESOURCE_PATH = "src/main/resource/contract/contracts/%1$s%2$s";
 
-    public static final String UNIQUE_CLASSPATH_RESOURCE_TPL = "contract/contracts/%s/%s";
+    public static final String UNIQUE_CLASSPATH_RESOURCE_TPL = "contract/contracts/%s";
     private static final Logger log = LogManager.getLogger(Utils.class);
-    private static final String JSON_EXTENSION = ".json";
+    private static final String JSON_EXTENSION = ".abi";
 
     public static ByteString eventSignatureOf(String event) {
         return ByteString.copyFrom(Hash.keccak256(Bytes.wrap(event.getBytes())).toArray());
@@ -192,8 +192,7 @@ public static String getABIFor(final FunctionType type, final String functionNam
 
     public static String getResourceABIFor(
             final FunctionType type, final String functionName, final String contractName) {
-        final var resourcePath =
-                String.format(UNIQUE_CLASSPATH_RESOURCE_TPL, contractName, contractName + JSON_EXTENSION);
+        final var resourcePath = String.format(UNIQUE_CLASSPATH_RESOURCE_TPL, contractName + JSON_EXTENSION);
         try (final var input = Utils.class.getClassLoader().getResourceAsStream(resourcePath)) {
             return getFunctionAbiFrom(input, functionName, type);
         } catch (final IOException e) {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.bin
deleted file mode 100644
index 362f0353244f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156100115760006000fd5b505b600060405161002190610104565b604051809103906000f08015801561003e573d600060003e3d6000fd5b509050600060405161004f90610104565b604051809103906000f08015801561006c573d600060003e3d6000fd5b509050600060405161007d90610104565b604051809103906000f08015801561009a573d600060003e3d6000fd5b50905060006040516100ab90610104565b604051809103906000f0801580156100c8573d600060003e3d6000fd5b50905060006040516100d990610104565b604051809103906000f0801580156100f6573d600060003e3d6000fd5b50905050505050505b610110565b60698061016583390190565b60478061011e6000396000f3fe608060405260043610600c575b60006000fdfea265627a7a7231582003cfe4586169d175f99ed193de925ba319097cbc82cef00137cdb4c1663f856a64736f6c634300050b0032608060405234801560105760006000fd5b506015565b60478060226000396000f3fe608060405260043610600c575b60006000fdfea265627a7a723158204ea8715ad41f394d4fcc4cab226d3d741141ee7aec4e3ae1d4456a4d16a8384864736f6c634300050b0032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.json
deleted file mode 100644
index be0c43e41c13..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.bin
deleted file mode 100644
index 513964207143..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.bin
+++ /dev/null
@@ -1 +0,0 @@
-610347610030600b82828239805160001a6073146000811461002057610022565bfe5b5030600052607381538281f3007300000000000000000000000000000000000000003014608060405260043610610079576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632f5ea1311461007e5780634a9f6709146100f35780634b71ac5714610147578063f92a96121461019f575b600080fd5b61009c600480360381019080803590602001909291905050506101d3565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156100df5780820151818401526020810190506100c4565b505050509050019250505060405180910390f35b61013160048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610265565b6040518082815260200191505060405180910390f35b61018560048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102b1565b604051808215151515815260200191505060405180910390f35b6101bd6004803603810190808035906020019092919050505061030a565b6040518082815260200191505060405180910390f35b60608160020180548060200260200160405190810160405280929190818152602001828054801561025957602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001906001019080831161020f575b50505050509050919050565b60008260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60008260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000816002018054905090509190505600a165627a7a72305820eb785a5419ecf73b8214af16820f9873e00d594f71ccfaabac83b22854d76dcc0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.json
deleted file mode 100644
index 55c0e9112b1c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "self",
-        "type": "AddressBook.Data storage"
-      }
-    ],
-    "name": "getAddressList",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "self",
-        "type": "AddressBook.Data storage"
-      },
-      {
-        "name": "userAddr",
-        "type": "address"
-      }
-    ],
-    "name": "getAddressIndex",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "self",
-        "type": "AddressBook.Data storage"
-      },
-      {
-        "name": "userAddr",
-        "type": "address"
-      }
-    ],
-    "name": "checkAddressInBook",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "self",
-        "type": "AddressBook.Data storage"
-      }
-    ],
-    "name": "getAddressBookSize",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.bin
deleted file mode 100644
index 136a3c7ecadf..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061071f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80631244792f1461003b57806370aeda361461006b575b600080fd5b61005560048036038101906100509190610264565b610087565b60405161006291906102a0565b60405180910390f35b610085600480360381019061008091906102f1565b610104565b005b6000808290508073ffffffffffffffffffffffffffffffffffffffff16630b7113fc6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100fc919061034a565b915050919050565b600060ff60f81b30836040518060200161011d906101f4565b6020820181038252601f19601f8201166040525060405160200161014191906103f1565b6040516020818303038152906040528051906020012060405160200161016a94939291906104be565b6040516020818303038152906040528051906020012060001c9050600082604051610194906101f4565b8190604051809103906000f59050801580156101b4573d6000803e3d6000fd5b5090508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16146101ef57600080fd5b505050565b6101dd8061050d83390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061023182610206565b9050919050565b61024181610226565b811461024c57600080fd5b50565b60008135905061025e81610238565b92915050565b60006020828403121561027a57610279610201565b5b60006102888482850161024f565b91505092915050565b61029a81610206565b82525050565b60006020820190506102b56000830184610291565b92915050565b6000819050919050565b6102ce816102bb565b81146102d957600080fd5b50565b6000813590506102eb816102c5565b92915050565b60006020828403121561030757610306610201565b5b6000610315848285016102dc565b91505092915050565b61032781610206565b811461033257600080fd5b50565b6000815190506103448161031e565b92915050565b6000602082840312156103605761035f610201565b5b600061036e84828501610335565b91505092915050565b600081519050919050565b600081905092915050565b60005b838110156103ab578082015181840152602081019050610390565b838111156103ba576000848401525b50505050565b60006103cb82610377565b6103d58185610382565b93506103e581856020860161038d565b80840191505092915050565b60006103fd82846103c0565b915081905092915050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b61044f61044a82610408565b610434565b82525050565b60008160601b9050919050565b600061046d82610455565b9050919050565b600061047f82610462565b9050919050565b61049761049282610226565b610474565b82525050565b6000819050919050565b6104b86104b3826102bb565b61049d565b82525050565b60006104ca828761043e565b6001820191506104da8286610486565b6014820191506104ea82856104a7565b6020820191506104fa82846104a7565b6020820191508190509594505050505056fe608060405234801561001057600080fd5b506101bd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630b7113fc1461003b578063807dcda614610059575b600080fd5b610043610063565b6040516100509190610110565b60405180910390f35b61006161006b565b005b600030905090565b604051610077906100d5565b604051809103906000f080158015610093573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b605c8061012c83390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b61010a816100e1565b82525050565b60006020820190506101256000830184610101565b9291505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212204bce249f922c0f3c943852ca0c043ae0a17f95389abc2c6ce5ec61cf629c1f4b64736f6c634300080c0033a2646970667358221220f80f382a09adfe4d5f77537363aa92b5b30e6373465d0793012d423aa6f3e9f564736f6c634300080c0033a2646970667358221220bf6b9d0f64ea781c317a79cda295796bc5c16faecda74870a7b069cc2950ca9264736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.json
deleted file mode 100644
index ed7de36f0101..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "returner_address",
-        "type": "address"
-      }
-    ],
-    "name": "callReturner",
-    "outputs": [
-      {
-        "internalType": "uint160",
-        "name": "",
-        "type": "uint160"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "createReturner",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.bin
deleted file mode 100644
index 4d667adc3af3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061064e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063a9059cbb14610046578063c4d66de814610062578063fc0c546a1461007e575b600080fd5b610060600480360381019061005b919061042a565b61009c565b005b61007c6004803603810190610077919061046a565b61020f565b005b61008661036d565b60405161009391906104a6565b60405180910390f35b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040518060400160405280601981526020017f7472616e7366657228616464726573732c75696e7432353629000000000000008152508051906020012085856040516024016101269291906104d0565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101909190610573565b6000604051808303816000865af19150503d80600081146101cd576040519150601f19603f3d011682016040523d82523d6000602084013e6101d2565b606091505b509150915081801561020057506000815114806101ff5750808060200190518101906101fe91906105c2565b5b5b61020957600080fd5b50505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061016773ffffffffffffffffffffffffffffffffffffffff163060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660405160240161029b9291906105ef565b6040516020818303038152906040527f49146bde000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103259190610573565b6000604051808303816000865af19150503d8060008114610362576040519150601f19603f3d011682016040523d82523d6000602084013e610367565b606091505b50505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103c182610396565b9050919050565b6103d1816103b6565b81146103dc57600080fd5b50565b6000813590506103ee816103c8565b92915050565b6000819050919050565b610407816103f4565b811461041257600080fd5b50565b600081359050610424816103fe565b92915050565b6000806040838503121561044157610440610391565b5b600061044f858286016103df565b925050602061046085828601610415565b9150509250929050565b6000602082840312156104805761047f610391565b5b600061048e848285016103df565b91505092915050565b6104a0816103b6565b82525050565b60006020820190506104bb6000830184610497565b92915050565b6104ca816103f4565b82525050565b60006040820190506104e56000830185610497565b6104f260208301846104c1565b9392505050565b600081519050919050565b600081905092915050565b60005b8381101561052d578082015181840152602081019050610512565b8381111561053c576000848401525b50505050565b600061054d826104f9565b6105578185610504565b935061056781856020860161050f565b80840191505092915050565b600061057f8284610542565b915081905092915050565b60008115159050919050565b61059f8161058a565b81146105aa57600080fd5b50565b6000815190506105bc81610596565b92915050565b6000602082840312156105d8576105d7610391565b5b60006105e6848285016105ad565b91505092915050565b60006040820190506106046000830185610497565b6106116020830184610497565b939250505056fea264697066735822122081b53c2689febc3571a0081f82d063ae8267a7fb7862d9a8427de6e244edba9a64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.json
deleted file mode 100644
index 3be9d18bc7d3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "token",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.bin
deleted file mode 100644
index d6e8dc4e99a1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610d62806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063639fc07514610046578063a9059cbb14610076578063f3a8dde314610092575b600080fd5b610060600480360381019061005b91906103e5565b6100ae565b60405161006d9190610421565b60405180910390f35b610090600480360381019061008b9190610472565b6101c0565b005b6100ac60048036038101906100a791906104eb565b610251565b005b600080604051806020016100c190610375565b6020820181038252601f19601f8201166040525090506000836040516020016100ea9190610586565b604051602081830303815290604052805190602001209050808251602084016000f592508273ffffffffffffffffffffffffffffffffffffffff1663c4d66de8856040518263ffffffff1660e01b81526004016101479190610421565b600060405180830381600087803b15801561016157600080fd5b505af1158015610175573d6000803e3d6000fd5b50505050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050919050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff1660e01b815260040161021b9291906105b0565b600060405180830381600087803b15801561023557600080fd5b505af1158015610249573d6000803e3d6000fd5b505050505050565b61016773ffffffffffffffffffffffffffffffffffffffff16838360008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16846040516024016102a194939291906105e8565b6040516020818303038152906040527feca36917000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161032b91906106a7565b6000604051808303816000865af19150503d8060008114610368576040519150601f19603f3d011682016040523d82523d6000602084013e61036d565b606091505b505050505050565b61066e806106bf83390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103b282610387565b9050919050565b6103c2816103a7565b81146103cd57600080fd5b50565b6000813590506103df816103b9565b92915050565b6000602082840312156103fb576103fa610382565b5b6000610409848285016103d0565b91505092915050565b61041b816103a7565b82525050565b60006020820190506104366000830184610412565b92915050565b6000819050919050565b61044f8161043c565b811461045a57600080fd5b50565b60008135905061046c81610446565b92915050565b6000806040838503121561048957610488610382565b5b6000610497858286016103d0565b92505060206104a88582860161045d565b9150509250929050565b60008160070b9050919050565b6104c8816104b2565b81146104d357600080fd5b50565b6000813590506104e5816104bf565b92915050565b60008060006060848603121561050457610503610382565b5b6000610512868287016103d0565b9350506020610523868287016103d0565b9250506040610534868287016104d6565b9150509250925092565b60008160601b9050919050565b60006105568261053e565b9050919050565b60006105688261054b565b9050919050565b61058061057b826103a7565b61055d565b82525050565b6000610592828461056f565b60148201915081905092915050565b6105aa8161043c565b82525050565b60006040820190506105c56000830185610412565b6105d260208301846105a1565b9392505050565b6105e2816104b2565b82525050565b60006080820190506105fd6000830187610412565b61060a6020830186610412565b6106176040830185610412565b61062460608301846105d9565b95945050505050565b600081519050919050565b600081905092915050565b60005b83811015610661578082015181840152602081019050610646565b83811115610670576000848401525b50505050565b60006106818261062d565b61068b8185610638565b935061069b818560208601610643565b80840191505092915050565b60006106b38284610676565b91508190509291505056fe608060405234801561001057600080fd5b5061064e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063a9059cbb14610046578063c4d66de814610062578063fc0c546a1461007e575b600080fd5b610060600480360381019061005b919061042a565b61009c565b005b61007c6004803603810190610077919061046a565b61020f565b005b61008661036d565b60405161009391906104a6565b60405180910390f35b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166040518060400160405280601981526020017f7472616e7366657228616464726573732c75696e7432353629000000000000008152508051906020012085856040516024016101269291906104d0565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101909190610573565b6000604051808303816000865af19150503d80600081146101cd576040519150601f19603f3d011682016040523d82523d6000602084013e6101d2565b606091505b509150915081801561020057506000815114806101ff5750808060200190518101906101fe91906105c2565b5b5b61020957600080fd5b50505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061016773ffffffffffffffffffffffffffffffffffffffff163060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660405160240161029b9291906105ef565b6040516020818303038152906040527f49146bde000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103259190610573565b6000604051808303816000865af19150503d8060008114610362576040519150601f19603f3d011682016040523d82523d6000602084013e610367565b606091505b50505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103c182610396565b9050919050565b6103d1816103b6565b81146103dc57600080fd5b50565b6000813590506103ee816103c8565b92915050565b6000819050919050565b610407816103f4565b811461041257600080fd5b50565b600081359050610424816103fe565b92915050565b6000806040838503121561044157610440610391565b5b600061044f858286016103df565b925050602061046085828601610415565b9150509250929050565b6000602082840312156104805761047f610391565b5b600061048e848285016103df565b91505092915050565b6104a0816103b6565b82525050565b60006020820190506104bb6000830184610497565b92915050565b6104ca816103f4565b82525050565b60006040820190506104e56000830185610497565b6104f260208301846104c1565b9392505050565b600081519050919050565b600081905092915050565b60005b8381101561052d578082015181840152602081019050610512565b8381111561053c576000848401525b50505050565b600061054d826104f9565b6105578185610504565b935061056781856020860161050f565b80840191505092915050565b600061057f8284610542565b915081905092915050565b60008115159050919050565b61059f8161058a565b81146105aa57600080fd5b50565b6000815190506105bc81610596565b92915050565b6000602082840312156105d8576105d7610391565b5b60006105e6848285016105ad565b91505092915050565b60006040820190506106046000830185610497565b6106116020830184610497565b939250505056fea264697066735822122081b53c2689febc3571a0081f82d063ae8267a7fb7862d9a8427de6e244edba9a64736f6c634300080c0033a2646970667358221220ba9a4fd9309d49bccafa00908e54f0bb8e5c21195e156f512e273f4708c2a71964736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.json
deleted file mode 100644
index 348163aa8aab..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "deployWithCREATE2",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "value",
-        "type": "int64"
-      }
-    ],
-    "name": "giveTokensToOperator",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.bin
deleted file mode 100644
index 13bc8aa476ce..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061034a806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c748654614610030575b600080fd5b61004a600480360381019061004591906101f2565b61004c565b005b6000808473ffffffffffffffffffffffffffffffffffffffff168484604051602401610079929190610263565b6040516020818303038152906040527f095ea7b3000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161010391906102fd565b600060405180830381855af49150503d806000811461013e576040519150601f19603f3d011682016040523d82523d6000602084013e610143565b606091505b50915091508161015257600080fd5b5050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101898261015e565b9050919050565b6101998161017e565b81146101a457600080fd5b50565b6000813590506101b681610190565b92915050565b6000819050919050565b6101cf816101bc565b81146101da57600080fd5b50565b6000813590506101ec816101c6565b92915050565b60008060006060848603121561020b5761020a610159565b5b6000610219868287016101a7565b935050602061022a868287016101a7565b925050604061023b868287016101dd565b9150509250925092565b61024e8161017e565b82525050565b61025d816101bc565b82525050565b60006040820190506102786000830185610245565b6102856020830184610254565b9392505050565b600081519050919050565b600081905092915050565b60005b838110156102c05780820151818401526020810190506102a5565b60008484015250505050565b60006102d78261028c565b6102e18185610297565b93506102f18185602086016102a2565b80840191505092915050565b600061030982846102cc565b91508190509291505056fea2646970667358221220d145aca43934b4b3f3d56bee29dd8a07d23dc874d12a241dd963d899d72d4d1364736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.json
deleted file mode 100644
index 135e26d34865..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"doIt","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.bin
deleted file mode 100644
index 39a785c450a4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50610791806100206000396000f3fe608060405234801561001057600080fd5b50600436106100675760003560e01c80637f6314d0116100505780637f6314d0146100a6578063e0d19a8b146100b9578063fef03573146100cc57600080fd5b80634753b51b1461006c5780637c41ad2c14610081575b600080fd5b61007f61007a366004610546565b6100df565b005b61009461008f366004610579565b610147565b60405190815260200160405180910390f35b61007f6100b4366004610546565b610240565b61007f6100c73660046105ca565b61029e565b61007f6100da3660046105ca565b6102fc565b60006100eb838361035a565b9050601681146101425760405162461bcd60e51b815260206004820152601160248201527f446973736f6369617465204661696c656400000000000000000000000000000060448201526064015b60405180910390fd5b505050565b604080516001600160a01b03831660248083019190915282518083039091018152604490910182526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f7c41ad2c00000000000000000000000000000000000000000000000000000000179052905160009182918291610167916101ce91906106a2565b6000604051808303816000865af19150503d806000811461020b576040519150601f19603f3d011682016040523d82523d6000602084013e610210565b606091505b509150915081610221576015610235565b8080602001905181019061023591906106dd565b60030b949350505050565b600061024c8383610483565b9050601681146101425760405162461bcd60e51b815260206004820152601060248201527f4173736f6369617465204661696c6564000000000000000000000000000000006044820152606401610139565b60006102aa83836104d2565b9050601681146101425760405162461bcd60e51b815260206004820152601c60248201527f4d756c7469706c65204173736f63696174696f6e73204661696c6564000000006044820152606401610139565b600061030883836104fe565b9050601681146101425760405162461bcd60e51b815260206004820152601d60248201527f4d756c7469706c6520446973736f63696174696f6e73204661696c65640000006044820152606401610139565b6040516001600160a01b0383811660248301528216604482015260009081908190610167907f099794e800000000000000000000000000000000000000000000000000000000906064015b60408051601f198184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff0000000000000000000000000000000000000000000000000000000090941693909317909252905161041091906106a2565b6000604051808303816000865af19150503d806000811461044d576040519150601f19603f3d011682016040523d82523d6000602084013e610452565b606091505b509150915081610463576015610477565b8080602001905181019061047791906106dd565b60030b95945050505050565b6040516001600160a01b0383811660248301528216604482015260009081908190610167907f49146bde00000000000000000000000000000000000000000000000000000000906064016103a5565b60008060006101676001600160a01b0316632e63879b60e01b86866040516024016103a5929190610700565b60008060006101676001600160a01b03166378b6391860e01b86866040516024016103a5929190610700565b80356001600160a01b038116811461054157600080fd5b919050565b6000806040838503121561055957600080fd5b6105628361052a565b91506105706020840161052a565b90509250929050565b60006020828403121561058b57600080fd5b6105948261052a565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080604083850312156105dd57600080fd5b6105e68361052a565b915060208084013567ffffffffffffffff8082111561060457600080fd5b818601915086601f83011261061857600080fd5b81358181111561062a5761062a61059b565b8060051b604051601f19603f8301168101818110858211171561064f5761064f61059b565b60405291825284820192508381018501918983111561066d57600080fd5b938501935b82851015610692576106838561052a565b84529385019392850192610672565b8096505050505050509250929050565b6000825160005b818110156106c357602081860181015185830152016106a9565b818111156106d2576000828501525b509190910192915050565b6000602082840312156106ef57600080fd5b81518060030b811461059457600080fd5b6000604082016001600160a01b0380861684526020604081860152828651808552606087019150828801945060005b8181101561074d57855185168352948301949183019160010161072f565b50909897505050505050505056fea2646970667358221220789f3f5d595f8401d3bfc78bb33e77b4014f2ccd0ca3c3990b0707abf8b5470f64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.json
deleted file mode 100644
index 51fc3064b8f2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "tokenAssociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "tokenDissociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "tokensAssociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "tokensDissociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "nonSupportedFunction",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.bin
deleted file mode 100644
index 9a501513cefb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516110c93803806110c983398181016040528101906100329190610151565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060405161007e906100e1565b604051809103906000f08015801561009a573d6000803e3d6000fd5b50600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061017e565b61062580610aa483390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061011e826100f3565b9050919050565b61012e81610113565b811461013957600080fd5b50565b60008151905061014b81610125565b92915050565b600060208284031215610167576101666100ee565b5b60006101758482850161013c565b91505092915050565b6109178061018d6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80637c41ad2c14610046578063d895540f14610076578063ec904f1914610094575b600080fd5b610060600480360381019061005b9190610518565b61009e565b60405161006d919061055e565b60405180910390f35b61007e6101b3565b60405161008b91906105d8565b60405180910390f35b61009c6101d9565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100d59190610602565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161013f919061068e565b6000604051808303816000865af19150503d806000811461017c576040519150601f19603f3d011682016040523d82523d6000602084013e610181565b606091505b5091509150816101925760156101a7565b808060200190518101906101a691906106de565b5b60030b92505050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60006102053360008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16610393565b9050601660030b811461024d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161024490610768565b60405180910390fd5b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663bf40cba93360008054906101000a900473ffffffffffffffffffffffffffffffffffffffff166040518363ffffffff1660e01b81526004016102ca929190610788565b600060405180830381600087803b1580156102e457600080fd5b505af19250505080156102f5575060015b610363576103016107be565b806308c379a0036103525750610315610851565b806103205750610354565b7f135475a7dd80871d9a7daccb556f4d9d3bd9593a0987c88f27057bc25cf91c3960405160405180910390a15061035e565b505b3d6000803e3d6000fd5b610390565b7ffd76336752e93f2cc77cf13a41be8b6c156731030376354d634d28a9a87b916260405160405180910390a15b50565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016103cc929190610788565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610436919061068e565b6000604051808303816000865af19150503d8060008114610473576040519150601f19603f3d011682016040523d82523d6000602084013e610478565b606091505b50915091508161048957601561049e565b8080602001905181019061049d91906106de565b5b60030b9250505092915050565b6000604051905090565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006104e5826104ba565b9050919050565b6104f5816104da565b811461050057600080fd5b50565b600081359050610512816104ec565b92915050565b60006020828403121561052e5761052d6104b5565b5b600061053c84828501610503565b91505092915050565b6000819050919050565b61055881610545565b82525050565b6000602082019050610573600083018461054f565b92915050565b6000819050919050565b600061059e610599610594846104ba565b610579565b6104ba565b9050919050565b60006105b082610583565b9050919050565b60006105c2826105a5565b9050919050565b6105d2816105b7565b82525050565b60006020820190506105ed60008301846105c9565b92915050565b6105fc816104da565b82525050565b600060208201905061061760008301846105f3565b92915050565b600081519050919050565b600081905092915050565b60005b83811015610651578082015181840152602081019050610636565b60008484015250505050565b60006106688261061d565b6106728185610628565b9350610682818560208601610633565b80840191505092915050565b600061069a828461065d565b915081905092915050565b60008160030b9050919050565b6106bb816106a5565b81146106c657600080fd5b50565b6000815190506106d8816106b2565b92915050565b6000602082840312156106f4576106f36104b5565b5b6000610702848285016106c9565b91505092915050565b600082825260208201905092915050565b7f546f6b656e206173736f6369617465206661696c656400000000000000000000600082015250565b600061075260168361070b565b915061075d8261071c565b602082019050919050565b6000602082019050818103600083015261078181610745565b9050919050565b600060408201905061079d60008301856105f3565b6107aa60208301846105f3565b9392505050565b60008160e01c9050919050565b600060033d11156107dd5760046000803e6107da6000516107b1565b90505b90565b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610829826107e0565b810181811067ffffffffffffffff82111715610848576108476107f1565b5b80604052505050565b600060443d106108de576108636104ab565b60043d036004823e80513d602482011167ffffffffffffffff8211171561088b5750506108de565b808201805167ffffffffffffffff8111156108a957505050506108de565b80602083010160043d0385018111156108c65750505050506108de565b6108d582602001850186610820565b82955050505050505b9056fea26469706673582212207b32e24bb6546a66499ca528084fb4cc3ea838e3c048f56cd9713dcc61b1525a64736f6c63430008100033608060405234801561001057600080fd5b50610605806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637c41ad2c1461003b578063bf40cba91461006b575b600080fd5b61005560048036038101906100509190610370565b610087565b60405161006291906103b6565b60405180910390f35b610085600480360381019061008091906103d1565b61019c565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100be9190610420565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161012891906104ac565b6000604051808303816000865af19150503d8060008114610165576040519150601f19603f3d011682016040523d82523d6000602084013e61016a565b606091505b50915091508161017b576015610190565b8080602001905181019061018f91906104fc565b5b60030b92505050919050565b60006101a883836101f5565b9050601660030b81146101f0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101e790610586565b60405180910390fd5b505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161022e9291906105a6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161029891906104ac565b6000604051808303816000865af19150503d80600081146102d5576040519150601f19603f3d011682016040523d82523d6000602084013e6102da565b606091505b5091509150816102eb576015610300565b808060200190518101906102ff91906104fc565b5b60030b9250505092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061033d82610312565b9050919050565b61034d81610332565b811461035857600080fd5b50565b60008135905061036a81610344565b92915050565b6000602082840312156103865761038561030d565b5b60006103948482850161035b565b91505092915050565b6000819050919050565b6103b08161039d565b82525050565b60006020820190506103cb60008301846103a7565b92915050565b600080604083850312156103e8576103e761030d565b5b60006103f68582860161035b565b92505060206104078582860161035b565b9150509250929050565b61041a81610332565b82525050565b60006020820190506104356000830184610411565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561046f578082015181840152602081019050610454565b60008484015250505050565b60006104868261043b565b6104908185610446565b93506104a0818560208601610451565b80840191505092915050565b60006104b8828461047b565b915081905092915050565b60008160030b9050919050565b6104d9816104c3565b81146104e457600080fd5b50565b6000815190506104f6816104d0565b92915050565b6000602082840312156105125761051161030d565b5b6000610520848285016104e7565b91505092915050565b600082825260208201905092915050565b7f546f6b656e206173736f6369617465206661696c656400000000000000000000600082015250565b6000610570601683610529565b915061057b8261053a565b602082019050919050565b6000602082019050818103600083015261059f81610563565b9050919050565b60006040820190506105bb6000830185610411565b6105c86020830184610411565b939250505056fea26469706673582212206d73565581082203361883b9346be4003df7efa91fb096c93cf05ac926c912e764736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.json
deleted file mode 100644
index f7132c5e0735..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.json
+++ /dev/null
@@ -1,45 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [],
-    "name": "CatchEvent",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [],
-    "name": "SuccessEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "associateToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "externalContract",
-    "outputs": [
-      {
-        "internalType": "contract CalledContract",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.bin
deleted file mode 100644
index cb43c244cd50..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b5060008060405180602001610024906100b7565b6020820181038252601f19601f820116604052509050600060405160200161004b9061011b565b604051602081830303815290604052805190602001209050808251602084016000f59250826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050610130565b61051d8061032d83390190565b600081905092915050565b7f7065726d69740000000000000000000000000000000000000000000000000000600082015250565b60006101056006836100c4565b9150610110826100cf565b600682019050919050565b6000610126826100f8565b9150819050919050565b6101ee8061013f6000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063bf40cba914610030575b600080fd5b61004a60048036038101906100459190610140565b61004c565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663bf40cba983836040518363ffffffff1660e01b81526004016100a792919061018f565b600060405180830381600087803b1580156100c157600080fd5b505af11580156100d5573d6000803e3d6000fd5b505050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061010d826100e2565b9050919050565b61011d81610102565b811461012857600080fd5b50565b60008135905061013a81610114565b92915050565b60008060408385031215610157576101566100dd565b5b60006101658582860161012b565b92505060206101768582860161012b565b9150509250929050565b61018981610102565b82525050565b60006040820190506101a46000830185610180565b6101b16020830184610180565b939250505056fea2646970667358221220ca8ef655957ecf3f6b7ff0b7a51dac3a75c311a49c664946614f9811713f901c64736f6c634300080c0033608060405234801561001057600080fd5b506104fd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80633af32abf1461003b578063bf40cba91461006b575b600080fd5b6100556004803603810190610050919061029c565b610087565b60405161006291906102e4565b60405180910390f35b610085600480360381019061008091906102ff565b610101565b005b60008173ffffffffffffffffffffffffffffffffffffffff1663611b40956040518163ffffffff1660e01b81526004016020604051808303816000875af11580156100d6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100fa919061036b565b9050919050565b600061010d8383610121565b90506016811461011c57600080fd5b505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161015a9291906103a7565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101c4919061044a565b6000604051808303816000865af19150503d8060008114610201576040519150601f19603f3d011682016040523d82523d6000602084013e610206565b606091505b50915091508161021757601561022c565b8080602001905181019061022b919061049a565b5b60030b9250505092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102698261023e565b9050919050565b6102798161025e565b811461028457600080fd5b50565b60008135905061029681610270565b92915050565b6000602082840312156102b2576102b1610239565b5b60006102c084828501610287565b91505092915050565b60008115159050919050565b6102de816102c9565b82525050565b60006020820190506102f960008301846102d5565b92915050565b6000806040838503121561031657610315610239565b5b600061032485828601610287565b925050602061033585828601610287565b9150509250929050565b610348816102c9565b811461035357600080fd5b50565b6000815190506103658161033f565b92915050565b60006020828403121561038157610380610239565b5b600061038f84828501610356565b91505092915050565b6103a18161025e565b82525050565b60006040820190506103bc6000830185610398565b6103c96020830184610398565b9392505050565b600081519050919050565b600081905092915050565b60005b838110156104045780820151818401526020810190506103e9565b83811115610413576000848401525b50505050565b6000610424826103d0565b61042e81856103db565b935061043e8185602086016103e6565b80840191505092915050565b60006104568284610419565b915081905092915050565b60008160030b9050919050565b61047781610461565b811461048257600080fd5b50565b6000815190506104948161046e565b92915050565b6000602082840312156104b0576104af610239565b5b60006104be84828501610485565b9150509291505056fea264697066735822122048eeed66a112d1feb254ae31c924eb141d051f5ce6f6914f3cce1b4233af93da64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.json
deleted file mode 100644
index 0c9f88b3615b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.bin
deleted file mode 100644
index 006bfb600152..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061161e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806315dacbea1461005c578063618dc65e1461008c5780638658f564146100bd5780639b23d3d9146100d9578063f52b4be514610109575b600080fd5b6100766004803603810190610071919061081a565b610125565b604051610083919061089d565b60405180910390f35b6100a660048036038101906100a191906109fe565b610243565b6040516100b4929190610af2565b60405180910390f35b6100d760048036038101906100d29190610fcc565b61039f565b005b6100f360048036038101906100ee919061081a565b6103f8565b604051610100919061089d565b60405180910390f35b610123600480360381019061011e9190610fcc565b610516565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016101629493929190611062565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101cc91906110e3565b6000604051808303816000865af19150503d8060008114610209576040519150601f19603f3d011682016040523d82523d6000602084013e61020e565b606091505b50915091508161021f576015610234565b808060200190518101906102339190611133565b5b60030b92505050949350505050565b6000606060008061016773ffffffffffffffffffffffffffffffffffffffff1663618dc65e60e01b878760405160240161027e929190611160565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102e891906110e3565b6000604051808303816000865af19150503d8060008114610325576040519150601f19603f3d011682016040523d82523d6000602084013e61032a565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc828260405161036092919061119f565b60405180910390a18161038457601560405180602001604052806000815250610388565b6016815b8160030b9150809450819550505050509250929050565b60006103ab838361065a565b9050601660030b81146103f3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103ea9061122c565b60405180910390fd5b505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016104359493929190611062565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161049f91906110e3565b6000604051808303816000865af19150503d80600081146104dc576040519150601f19603f3d011682016040523d82523d6000602084013e6104e1565b606091505b5091509150816104f2576015610507565b808060200190518101906105069190611133565b5b60030b92505050949350505050565b60008061016773ffffffffffffffffffffffffffffffffffffffff1684846040516024016105459291906115b1565b6040516020818303038152906040527f0e71804f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105cf91906110e3565b600060405180830381855af49150503d806000811461060a576040519150601f19603f3d011682016040523d82523d6000602084013e61060f565b606091505b509150915081610654576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161064b9061122c565b60405180910390fd5b50505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16630e71804f60e01b86866040516024016106939291906115b1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106fd91906110e3565b6000604051808303816000865af19150503d806000811461073a576040519150601f19603f3d011682016040523d82523d6000602084013e61073f565b606091505b509150915081610750576015610765565b808060200190518101906107649190611133565b5b60030b9250505092915050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006107b182610786565b9050919050565b6107c1816107a6565b81146107cc57600080fd5b50565b6000813590506107de816107b8565b92915050565b6000819050919050565b6107f7816107e4565b811461080257600080fd5b50565b600081359050610814816107ee565b92915050565b600080600080608085870312156108345761083361077c565b5b6000610842878288016107cf565b9450506020610853878288016107cf565b9350506040610864878288016107cf565b925050606061087587828801610805565b91505092959194509250565b60008160070b9050919050565b61089781610881565b82525050565b60006020820190506108b2600083018461088e565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61090b826108c2565b810181811067ffffffffffffffff8211171561092a576109296108d3565b5b80604052505050565b600061093d610772565b90506109498282610902565b919050565b600067ffffffffffffffff821115610969576109686108d3565b5b610972826108c2565b9050602081019050919050565b82818337600083830152505050565b60006109a161099c8461094e565b610933565b9050828152602081018484840111156109bd576109bc6108bd565b5b6109c884828561097f565b509392505050565b600082601f8301126109e5576109e46108b8565b5b81356109f584826020860161098e565b91505092915050565b60008060408385031215610a1557610a1461077c565b5b6000610a23858286016107cf565b925050602083013567ffffffffffffffff811115610a4457610a43610781565b5b610a50858286016109d0565b9150509250929050565b6000819050919050565b610a6d81610a5a565b82525050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610aad578082015181840152602081019050610a92565b60008484015250505050565b6000610ac482610a73565b610ace8185610a7e565b9350610ade818560208601610a8f565b610ae7816108c2565b840191505092915050565b6000604082019050610b076000830185610a64565b8181036020830152610b198184610ab9565b90509392505050565b600080fd5b600080fd5b600067ffffffffffffffff821115610b4757610b466108d3565b5b602082029050602081019050919050565b600080fd5b610b6681610881565b8114610b7157600080fd5b50565b600081359050610b8381610b5d565b92915050565b60008115159050919050565b610b9e81610b89565b8114610ba957600080fd5b50565b600081359050610bbb81610b95565b92915050565b600060608284031215610bd757610bd6610b22565b5b610be16060610933565b90506000610bf1848285016107cf565b6000830152506020610c0584828501610b74565b6020830152506040610c1984828501610bac565b60408301525092915050565b6000610c38610c3384610b2c565b610933565b90508083825260208201905060608402830185811115610c5b57610c5a610b58565b5b835b81811015610c845780610c708882610bc1565b845260208401935050606081019050610c5d565b5050509392505050565b600082601f830112610ca357610ca26108b8565b5b8135610cb3848260208601610c25565b91505092915050565b600060208284031215610cd257610cd1610b22565b5b610cdc6020610933565b9050600082013567ffffffffffffffff811115610cfc57610cfb610b27565b5b610d0884828501610c8e565b60008301525092915050565b600067ffffffffffffffff821115610d2f57610d2e6108d3565b5b602082029050602081019050919050565b600067ffffffffffffffff821115610d5b57610d5a6108d3565b5b602082029050602081019050919050565b600060808284031215610d8257610d81610b22565b5b610d8c6080610933565b90506000610d9c848285016107cf565b6000830152506020610db0848285016107cf565b6020830152506040610dc484828501610b74565b6040830152506060610dd884828501610bac565b60608301525092915050565b6000610df7610df284610d40565b610933565b90508083825260208201905060808402830185811115610e1a57610e19610b58565b5b835b81811015610e435780610e2f8882610d6c565b845260208401935050608081019050610e1c565b5050509392505050565b600082601f830112610e6257610e616108b8565b5b8135610e72848260208601610de4565b91505092915050565b600060608284031215610e9157610e90610b22565b5b610e9b6060610933565b90506000610eab848285016107cf565b600083015250602082013567ffffffffffffffff811115610ecf57610ece610b27565b5b610edb84828501610c8e565b602083015250604082013567ffffffffffffffff811115610eff57610efe610b27565b5b610f0b84828501610e4d565b60408301525092915050565b6000610f2a610f2584610d14565b610933565b90508083825260208201905060208402830185811115610f4d57610f4c610b58565b5b835b81811015610f9457803567ffffffffffffffff811115610f7257610f716108b8565b5b808601610f7f8982610e7b565b85526020850194505050602081019050610f4f565b5050509392505050565b600082601f830112610fb357610fb26108b8565b5b8135610fc3848260208601610f17565b91505092915050565b60008060408385031215610fe357610fe261077c565b5b600083013567ffffffffffffffff81111561100157611000610781565b5b61100d85828601610cbc565b925050602083013567ffffffffffffffff81111561102e5761102d610781565b5b61103a85828601610f9e565b9150509250929050565b61104d816107a6565b82525050565b61105c816107e4565b82525050565b60006080820190506110776000830187611044565b6110846020830186611044565b6110916040830185611044565b61109e6060830184611053565b95945050505050565b600081905092915050565b60006110bd82610a73565b6110c781856110a7565b93506110d7818560208601610a8f565b80840191505092915050565b60006110ef82846110b2565b915081905092915050565b60008160030b9050919050565b611110816110fa565b811461111b57600080fd5b50565b60008151905061112d81611107565b92915050565b6000602082840312156111495761114861077c565b5b60006111578482850161111e565b91505092915050565b60006040820190506111756000830185611044565b81810360208301526111878184610ab9565b90509392505050565b61119981610b89565b82525050565b60006040820190506111b46000830185611190565b81810360208301526111c68184610ab9565b90509392505050565b600082825260208201905092915050565b7f43727970746f205472616e73666572204661696c656400000000000000000000600082015250565b60006112166016836111cf565b9150611221826111e0565b602082019050919050565b6000602082019050818103600083015261124581611209565b9050919050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b611281816107a6565b82525050565b61129081610881565b82525050565b61129f81610b89565b82525050565b6060820160008201516112bb6000850182611278565b5060208201516112ce6020850182611287565b5060408201516112e16040850182611296565b50505050565b60006112f383836112a5565b60608301905092915050565b6000602082019050919050565b60006113178261124c565b6113218185611257565b935061132c83611268565b8060005b8381101561135d57815161134488826112e7565b975061134f836112ff565b925050600181019050611330565b5085935050505092915050565b60006020830160008301518482036000860152611387828261130c565b9150508091505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6080820160008201516114026000850182611278565b5060208201516114156020850182611278565b5060408201516114286040850182611287565b50606082015161143b6060850182611296565b50505050565b600061144d83836113ec565b60808301905092915050565b6000602082019050919050565b6000611471826113c0565b61147b81856113cb565b9350611486836113dc565b8060005b838110156114b757815161149e8882611441565b97506114a983611459565b92505060018101905061148a565b5085935050505092915050565b60006060830160008301516114dc6000860182611278565b50602083015184820360208601526114f4828261130c565b9150506040830151848203604086015261150e8282611466565b9150508091505092915050565b600061152783836114c4565b905092915050565b6000602082019050919050565b600061154782611394565b611551818561139f565b935083602082028501611563856113b0565b8060005b8581101561159f5784840389528151611580858261151b565b945061158b8361152f565b925060208a01995050600181019050611567565b50829750879550505050505092915050565b600060408201905081810360008301526115cb818561136a565b905081810360208301526115df818461153c565b9050939250505056fea2646970667358221220dcaffc34987ef5c6c5584d501b642c999fcd362656fa34fce8c3e556e4701daf64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.json
deleted file mode 100644
index 6ee796ece0c3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bool","name":"","type":"bool"},{"indexed":false,"internalType":"bytes","name":"","type":"bytes"}],"name":"CallResponseEvent","type":"event"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes","name":"encodedFunctionSelector","type":"bytes"}],"name":"redirectForToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"},{"internalType":"bytes","name":"response","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"serialNumber","type":"uint256"}],"name":"transferFromNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"components":[{"internalType":"address","name":"accountID","type":"address"},{"internalType":"int64","name":"amount","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.AccountAmount[]","name":"transfers","type":"tuple[]"}],"internalType":"struct IHederaTokenService.TransferList","name":"transferList","type":"tuple"},{"components":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"address","name":"accountID","type":"address"},{"internalType":"int64","name":"amount","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.AccountAmount[]","name":"transfers","type":"tuple[]"},{"components":[{"internalType":"address","name":"senderAccountID","type":"address"},{"internalType":"address","name":"receiverAccountID","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.NftTransfer[]","name":"nftTransfers","type":"tuple[]"}],"internalType":"struct IHederaTokenService.TokenTransferList[]","name":"tokenTransfers","type":"tuple[]"}],"name":"transferMultipleTokens","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"components":[{"internalType":"address","name":"accountID","type":"address"},{"internalType":"int64","name":"amount","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.AccountAmount[]","name":"transfers","type":"tuple[]"}],"internalType":"struct IHederaTokenService.TransferList","name":"transferList","type":"tuple"},{"components":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"address","name":"accountID","type":"address"},{"internalType":"int64","name":"amount","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.AccountAmount[]","name":"transfers","type":"tuple[]"},{"components":[{"internalType":"address","name":"senderAccountID","type":"address"},{"internalType":"address","name":"receiverAccountID","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"},{"internalType":"bool","name":"isApproval","type":"bool"}],"internalType":"struct IHederaTokenService.NftTransfer[]","name":"nftTransfers","type":"tuple[]"}],"internalType":"struct IHederaTokenService.TokenTransferList[]","name":"tokenTransfers","type":"tuple[]"}],"name":"transferMultipleTokensDelegateCall","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.bin
deleted file mode 100644
index 25fe76460171..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610f62806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806313d64578146100515780632f7a17791461006d5780639e66661414610089578063ae7ccfce146100a5575b600080fd5b61006b60048036038101906100669190610648565b6100c1565b005b610087600480360381019061008291906106c3565b61022a565b005b6100a3600480360381019061009e9190610946565b610351565b005b6100bf60048036038101906100ba91906106c3565b610478565b005b60008061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016100fc9493929190610a1f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101669190610ad5565b6000604051808303816000865af19150503d80600081146101a3576040519150601f19603f3d011682016040523d82523d6000602084013e6101a8565b606091505b5091509150816101b757600080fd5b6000818060200190518101906101cd9190610b25565b905060168160030b146101df57600080fd5b8315610220576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161021790610baf565b60405180910390fd5b5050505050505050565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b878787876040516024016102659493929190610a1f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102cf9190610ad5565b6000604051808303816000865af19150503d806000811461030c576040519150601f19603f3d011682016040523d82523d6000602084013e610311565b606091505b50915091508161032057600080fd5b6000818060200190518101906103369190610b25565b905060168160030b1461034857600080fd5b50505050505050565b60008061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b8787878760405160240161038c9493929190610d4b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103f69190610ad5565b6000604051808303816000865af19150503d8060008114610433576040519150601f19603f3d011682016040523d82523d6000602084013e610438565b606091505b50915091508161044757600080fd5b60008180602001905181019061045d9190610b25565b905060168160030b1461046f57600080fd5b50505050505050565b3073ffffffffffffffffffffffffffffffffffffffff166313d645788585858560016040518663ffffffff1660e01b81526004016104ba959493929190610db4565b600060405180830381600087803b1580156104d457600080fd5b505af19250505080156104e5575060015b61055e576104f1610e14565b806308c379a00361054d5750610505610e36565b80610510575061054f565b7fcf34ef537ac33ee1ac626ca1587a0a7e8e51561e5514f8cb36afa1c5102b3bab8160405161053f9190610f0a565b60405180910390a150610559565b505b3d6000803e3d6000fd5b61055f565b5b50505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006105a482610579565b9050919050565b6105b481610599565b81146105bf57600080fd5b50565b6000813590506105d1816105ab565b92915050565b60008160070b9050919050565b6105ed816105d7565b81146105f857600080fd5b50565b60008135905061060a816105e4565b92915050565b60008115159050919050565b61062581610610565b811461063057600080fd5b50565b6000813590506106428161061c565b92915050565b600080600080600060a086880312156106645761066361056f565b5b6000610672888289016105c2565b9550506020610683888289016105c2565b9450506040610694888289016105c2565b93505060606106a5888289016105fb565b92505060806106b688828901610633565b9150509295509295909350565b600080600080608085870312156106dd576106dc61056f565b5b60006106eb878288016105c2565b94505060206106fc878288016105c2565b935050604061070d878288016105c2565b925050606061071e878288016105fb565b91505092959194509250565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6107788261072f565b810181811067ffffffffffffffff8211171561079757610796610740565b5b80604052505050565b60006107aa610565565b90506107b6828261076f565b919050565b600067ffffffffffffffff8211156107d6576107d5610740565b5b602082029050602081019050919050565b600080fd5b60006107ff6107fa846107bb565b6107a0565b90508083825260208201905060208402830185811115610822576108216107e7565b5b835b8181101561084b578061083788826105c2565b845260208401935050602081019050610824565b5050509392505050565b600082601f83011261086a5761086961072a565b5b813561087a8482602086016107ec565b91505092915050565b600067ffffffffffffffff82111561089e5761089d610740565b5b602082029050602081019050919050565b60006108c26108bd84610883565b6107a0565b905080838252602082019050602084028301858111156108e5576108e46107e7565b5b835b8181101561090e57806108fa88826105fb565b8452602084019350506020810190506108e7565b5050509392505050565b600082601f83011261092d5761092c61072a565b5b813561093d8482602086016108af565b91505092915050565b600080600080608085870312156109605761095f61056f565b5b600061096e878288016105c2565b945050602085013567ffffffffffffffff81111561098f5761098e610574565b5b61099b87828801610855565b935050604085013567ffffffffffffffff8111156109bc576109bb610574565b5b6109c887828801610855565b925050606085013567ffffffffffffffff8111156109e9576109e8610574565b5b6109f587828801610918565b91505092959194509250565b610a0a81610599565b82525050565b610a19816105d7565b82525050565b6000608082019050610a346000830187610a01565b610a416020830186610a01565b610a4e6040830185610a01565b610a5b6060830184610a10565b95945050505050565b600081519050919050565b600081905092915050565b60005b83811015610a98578082015181840152602081019050610a7d565b60008484015250505050565b6000610aaf82610a64565b610ab98185610a6f565b9350610ac9818560208601610a7a565b80840191505092915050565b6000610ae18284610aa4565b915081905092915050565b60008160030b9050919050565b610b0281610aec565b8114610b0d57600080fd5b50565b600081519050610b1f81610af9565b92915050565b600060208284031215610b3b57610b3a61056f565b5b6000610b4984828501610b10565b91505092915050565b600082825260208201905092915050565b7f576973682c20636f6d6d616e642c206574632e00000000000000000000000000600082015250565b6000610b99601383610b52565b9150610ba482610b63565b602082019050919050565b60006020820190508181036000830152610bc881610b8c565b9050919050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b610c0481610599565b82525050565b6000610c168383610bfb565b60208301905092915050565b6000602082019050919050565b6000610c3a82610bcf565b610c448185610bda565b9350610c4f83610beb565b8060005b83811015610c80578151610c678882610c0a565b9750610c7283610c22565b925050600181019050610c53565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b610cc2816105d7565b82525050565b6000610cd48383610cb9565b60208301905092915050565b6000602082019050919050565b6000610cf882610c8d565b610d028185610c98565b9350610d0d83610ca9565b8060005b83811015610d3e578151610d258882610cc8565b9750610d3083610ce0565b925050600181019050610d11565b5085935050505092915050565b6000608082019050610d606000830187610a01565b8181036020830152610d728186610c2f565b90508181036040830152610d868185610c2f565b90508181036060830152610d9a8184610ced565b905095945050505050565b610dae81610610565b82525050565b600060a082019050610dc96000830188610a01565b610dd66020830187610a01565b610de36040830186610a01565b610df06060830185610a10565b610dfd6080830184610da5565b9695505050505050565b60008160e01c9050919050565b600060033d1115610e335760046000803e610e30600051610e07565b90505b90565b600060443d10610ec357610e48610565565b60043d036004823e80513d602482011167ffffffffffffffff82111715610e70575050610ec3565b808201805167ffffffffffffffff811115610e8e5750505050610ec3565b80602083010160043d038501811115610eab575050505050610ec3565b610eba8260200185018661076f565b82955050505050505b90565b600081519050919050565b6000610edc82610ec6565b610ee68185610b52565b9350610ef6818560208601610a7a565b610eff8161072f565b840191505092915050565b60006020820190508181036000830152610f248184610ed1565b90509291505056fea264697066735822122062e025b859fe2de9c78f9f5458267da181c63b7640a1707b3e95e4bcf8fcdea564736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.json b/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.json
deleted file mode 100644
index d5516b8bbf51..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"message","type":"string"}],"name":"Log","type":"event"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"serialNum","type":"int64"},{"internalType":"bool","name":"revertAfter","type":"bool"}],"name":"createDirectly","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"amount","type":"int64"}],"name":"createDirectlyViaFungible","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"serialNum","type":"int64"}],"name":"createIndirectlyRevertingAndRecover","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"senders","type":"address[]"},{"internalType":"address[]","name":"receivers","type":"address[]"},{"internalType":"int64[]","name":"serialNums","type":"int64[]"}],"name":"createSeveralDirectly","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.bin
deleted file mode 100644
index 5c886fe21d9b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061092b806100206000396000f3fe60806040526004361061001e5760003560e01c8063ec25e5b414610023575b600080fd5b61003d6004803603810190610038919061055a565b61003f565b005b600061004b83836102c4565b9050601660030b811461005d57600080fd5b60003390506000600267ffffffffffffffff81111561007f5761007e61059a565b5b6040519080825280602002602001820160405280156100ad5781602001602082028036833780820191505090505b50905081816000815181106100c5576100c46105c9565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110610114576101136105c9565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000600267ffffffffffffffff81111561016b5761016a61059a565b5b6040519080825280602002602001820160405280156101995781602001602082028036833780820191505090505b5090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff816000815181106101d1576101d06105c9565b5b602002602001019060070b908160070b815250506001816001815181106101fb576101fa6105c9565b5b602002602001019060070b908160070b8152505061021a8583836103dc565b9350601660030b841461022c57600080fd5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81600181518110610261576102606105c9565b5b602002602001019060070b908160070b8152505060018160008151811061028b5761028a6105c9565b5b602002602001019060070b908160070b815250506102aa8583836103dc565b9350601660030b84146102bc57600080fd5b505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016102fd929190610607565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161036791906106aa565b6000604051808303816000865af19150503d80600081146103a4576040519150601f19603f3d011682016040523d82523d6000602084013e6103a9565b606091505b5091509150816103ba5760156103cf565b808060200190518101906103ce91906106fa565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b878787604051602401610417939291906108b0565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161048191906106aa565b6000604051808303816000865af19150503d80600081146104be576040519150601f19603f3d011682016040523d82523d6000602084013e6104c3565b606091505b5091509150816104d45760156104e9565b808060200190518101906104e891906106fa565b5b60030b925050509392505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610527826104fc565b9050919050565b6105378161051c565b811461054257600080fd5b50565b6000813590506105548161052e565b92915050565b60008060408385031215610571576105706104f7565b5b600061057f85828601610545565b925050602061059085828601610545565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6106018161051c565b82525050565b600060408201905061061c60008301856105f8565b61062960208301846105f8565b9392505050565b600081519050919050565b600081905092915050565b60005b83811015610664578082015181840152602081019050610649565b83811115610673576000848401525b50505050565b600061068482610630565b61068e818561063b565b935061069e818560208601610646565b80840191505092915050565b60006106b68284610679565b915081905092915050565b60008160030b9050919050565b6106d7816106c1565b81146106e257600080fd5b50565b6000815190506106f4816106ce565b92915050565b6000602082840312156107105761070f6104f7565b5b600061071e848285016106e5565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61075c8161051c565b82525050565b600061076e8383610753565b60208301905092915050565b6000602082019050919050565b600061079282610727565b61079c8185610732565b93506107a783610743565b8060005b838110156107d85781516107bf8882610762565b97506107ca8361077a565b9250506001810190506107ab565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60008160070b9050919050565b61082781610811565b82525050565b6000610839838361081e565b60208301905092915050565b6000602082019050919050565b600061085d826107e5565b61086781856107f0565b935061087283610801565b8060005b838110156108a357815161088a888261082d565b975061089583610845565b925050600181019050610876565b5085935050505092915050565b60006060820190506108c560008301866105f8565b81810360208301526108d78185610787565b905081810360408301526108eb8184610852565b905094935050505056fea2646970667358221220b39529aad7194f5dd9bd6f4ca742765d448d1c114b15fddc2710cf0efcfccb1364736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.json
deleted file mode 100644
index 93d6a9ff94ab..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"haplessRelayer","type":"address"},{"internalType":"address","name":"exploitTokenAddress","type":"address"}],"name":"stealFrom","outputs":[],"stateMutability":"payable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.bin
deleted file mode 100644
index b892875c5846..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060e58061001f6000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806370a08231146044575b600080fd5b348015604f57600080fd5b506082600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506098565b6040518082815260200191505060405180910390f35b60008173ffffffffffffffffffffffffffffffffffffffff163190509190505600a165627a7a723058207073387ea61dfadd35294adeac8889b61983cd9b50906d51d92bb973730452cf0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.json
deleted file mode 100644
index 33b7a6d81167..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.bin
deleted file mode 100644
index 6ce94b2de2e9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561000f575f80fd5b5061016d8061001d5f395ff3fe608060405234801561000f575f80fd5b5060043610610029575f3560e01c806370a082311461002d575b5f80fd5b610047600480360381019061004291906100db565b61005d565b604051610054919061011e565b60405180910390f35b5f8173ffffffffffffffffffffffffffffffffffffffff16319050919050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6100aa82610081565b9050919050565b6100ba816100a0565b81146100c4575f80fd5b50565b5f813590506100d5816100b1565b92915050565b5f602082840312156100f0576100ef61007d565b5b5f6100fd848285016100c7565b91505092915050565b5f819050919050565b61011881610106565b82525050565b5f6020820190506101315f83018461010f565b9291505056fea26469706673582212205ebc2c55cc299a65ddb0bf99308e3572cd45f23dd7915d2511f26ab67af2ea7264736f6c63430008140033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.json
deleted file mode 100644
index dce930e9e562..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.bin
deleted file mode 100644
index cd687e8f1eef..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260e4806100126000396000f3fe608060405260043610601c5760003560e01c8063f455e22014601e575b005b348015602957600080fd5b50605d60048036036020811015603e57600080fd5b81019080803567ffffffffffffffff1690602001909291905050506073565b6040518082815260200191505060405180910390f35b60008167ffffffffffffffff166effffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1631905091905056fea265627a7a72315820a62f2c6b16c92b6388987a509b23a0961ae2f95ae88733c9c68cad2f1683379664736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.json
deleted file mode 100644
index 32f6e64646e7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "accountNum",
-        "type": "uint64"
-      }
-    ],
-    "name": "lookup",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.bin
deleted file mode 100644
index c62cf2bc93b9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610a9a806100206000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c806362f50e081161006657806362f50e0814610159578063cacdf36514610189578063d74b0d69146101a5578063e2420ef2146101c3578063f35fd400146101df5761009e565b806320e54b96146100a35780632177d2ce146100d3578063449d2c7c146101035780635fa585ef1461011f57806361bc221a1461013b575b600080fd5b6100bd60048036038101906100b891906106f8565b6101fb565b6040516100ca91906107db565b60405180910390f35b6100ed60048036038101906100e8919061068b565b61021f565b6040516100fa91906107db565b60405180910390f35b61011d60048036038101906101189190610642565b610237565b005b610139600480360381019061013491906106f8565b6102a6565b005b610143610352565b6040516101509190610816565b60405180910390f35b610173600480360381019061016e91906106b8565b610358565b6040516101809190610816565b60405180910390f35b6101a3600480360381019061019e91906106f8565b610389565b005b6101ad610472565b6040516101ba91906107db565b60405180910390f35b6101dd60048036038101906101d891906106f8565b61047b565b005b6101f960048036038101906101f4919061068b565b6104ee565b005b6002818154811061020b57600080fd5b906000526020600020016000915090505481565b60016020528060005260406000206000915090505481565b60004360405160200161024a91906107c0565b60405160208183030381529060405280519060200120905081600360008381526020019081526020016000209080519060200190610289929190610510565b506004600081548092919061029d906108d8565b91905055505050565b60005b818110156103365760008160001b436040516020016102c9929190610794565b604051602081830303815290604052805190602001209050806001600083815260200190815260200160002081905550600281908060018154018082558091505060019003906000526020600020016000909190919091505550808061032e906108d8565b9150506102a9565b506004600081548092919061034a906108d8565b919050555050565b60045481565b6003602052816000526040600020818154811061037457600080fd5b90600052602060002001600091509150505481565b6002805490508111156103d1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103c8906107f6565b60405180910390fd5b60005b818110156104565760008160001b436040516020016103f4929190610794565b60405160208183030381529060405280519060200120905080600160006002858154811061042557610424610964565b5b906000526020600020015481526020019081526020016000208190555050808061044e906108d8565b9150506103d4565b506004600081548092919061046a906108d8565b919050555050565b60008054905090565b8060001b42604051602001610491929190610794565b6040516020818303038152906040528051906020012060008190555060005b818110156104d2576000805490505080806104ca906108d8565b9150506104b0565b50600460008154809291906104e6906108d8565b919050555050565b8060008190555060046000815480929190610508906108d8565b919050555050565b82805482825590600052602060002090810192821561054c579160200282015b8281111561054b578251825591602001919060010190610530565b5b509050610559919061055d565b5090565b5b8082111561057657600081600090555060010161055e565b5090565b600061058d61058884610856565b610831565b905080838252602082019050828560208602820111156105b0576105af6109c7565b5b60005b858110156105e057816105c6888261062d565b8452602084019350602083019250506001810190506105b3565b5050509392505050565b600082601f8301126105ff576105fe6109c2565b5b813561060f84826020860161057a565b91505092915050565b60008135905061062781610a36565b92915050565b60008135905061063c81610a4d565b92915050565b600060208284031215610658576106576109d1565b5b600082013567ffffffffffffffff811115610676576106756109cc565b5b610682848285016105ea565b91505092915050565b6000602082840312156106a1576106a06109d1565b5b60006106af84828501610618565b91505092915050565b600080604083850312156106cf576106ce6109d1565b5b60006106dd85828601610618565b92505060206106ee8582860161062d565b9150509250929050565b60006020828403121561070e5761070d6109d1565b5b600061071c8482850161062d565b91505092915050565b61072e81610893565b82525050565b61074561074082610893565b610921565b82525050565b6000610758602383610882565b9150610763826109e7565b604082019050919050565b6107778161089d565b82525050565b61078e6107898261089d565b61092b565b82525050565b60006107a08285610734565b6020820191506107b0828461077d565b6020820191508190509392505050565b60006107cc828461077d565b60208201915081905092915050565b60006020820190506107f06000830184610725565b92915050565b6000602082019050818103600083015261080f8161074b565b9050919050565b600060208201905061082b600083018461076e565b92915050565b600061083b61084c565b905061084782826108a7565b919050565b6000604051905090565b600067ffffffffffffffff82111561087157610870610993565b5b602082029050602081019050919050565b600082825260208201905092915050565b6000819050919050565b6000819050919050565b6108b0826109d6565b810181811067ffffffffffffffff821117156108cf576108ce610993565b5b80604052505050565b60006108e38261089d565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82141561091657610915610935565b5b600182019050919050565b6000819050919050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f6e6f7420656e6f756768206b6579732068617665206265656e2067656e65726160008201527f7465640000000000000000000000000000000000000000000000000000000000602082015250565b610a3f81610893565b8114610a4a57600080fd5b50565b610a568161089d565b8114610a6157600080fd5b5056fea2646970667358221220746ef76eff0b9ab1c775c466f55c6d034aba19671951a771489fa6a93826fcae64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.json
deleted file mode 100644
index 1b616b49697b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.json
+++ /dev/null
@@ -1,155 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "benchmarkingMap",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "bigArray",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256[]",
-        "name": "data",
-        "type": "uint256[]"
-      }
-    ],
-    "name": "bigSSTORE",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "counter",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "loadTx",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "mapKeys",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "singleMLOAD",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "sstoreCreate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "sstoreUpdate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_singleProp",
-        "type": "bytes32"
-      }
-    ],
-    "name": "twoSSTOREs",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BigArray/BigArray.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BigArray/BigArray.bin
deleted file mode 100644
index 539f23998f45..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BigArray/BigArray.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506103a6806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063170ab4051461004657806349c4176a146100625780636e366c9614610092575b600080fd5b610060600480360381019061005b919061021d565b6100ae565b005b61007c6004803603810190610077919061021d565b610153565b6040516100899190610259565b60405180910390f35b6100ac60048036038101906100a7919061021d565b610177565b005b8067ffffffffffffffff8111156100c8576100c7610325565b5b6040519080825280602002602001820160405280156100f65781602001602082028036833780820191505090505b506000908051906020019061010c92919061019e565b5060005b8181101561014f5760116000828154811061012e5761012d6102f6565b5b906000526020600020018190555080806101479061027e565b915050610110565b5050565b6000818154811061016357600080fd5b906000526020600020016000915090505481565b80600060018154811061018d5761018c6102f6565b5b906000526020600020018190555050565b8280548282559060005260206000209081019282156101da579160200282015b828111156101d95782518255916020019190600101906101be565b5b5090506101e791906101eb565b5090565b5b808211156102045760008160009055506001016101ec565b5090565b60008135905061021781610359565b92915050565b60006020828403121561023357610232610354565b5b600061024184828501610208565b91505092915050565b61025381610274565b82525050565b600060208201905061026e600083018461024a565b92915050565b6000819050919050565b600061028982610274565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156102bc576102bb6102c7565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b61036281610274565b811461036d57600080fd5b5056fea26469706673582212200c0c6278c9b8e5c45bacc63bfa25082005ce539ced69927c1e38daeeff98c59c64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.bin
deleted file mode 100644
index 01d89f646523..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052602a6000806101000a81548163ffffffff021916908363ffffffff16021790555034801561003157600080fd5b50610155806100416000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063afeb364f14610030575b600080fd5b6100626004803603602081101561004657600080fd5b81019080803563ffffffff1690602001909291905050506100dd565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100a2578082015181840152602081019050610087565b50505050905090810190601f1680156100cf5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60608163ffffffff166040519080825280601f01601f1916602001820160405280156101185781602001600182028038833980820191505090505b50905091905056fea265627a7a723158206de5e60eeccd0abfb33d4995c45006a7ea6899073d0acac8b4ee569316b1f0b764736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.json
deleted file mode 100644
index 1f008660ce9e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "how",
-        "type": "uint32"
-      }
-    ],
-    "name": "pick",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.bin
deleted file mode 100644
index a1c2ba90f0f6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516106123803806106128339818101604052602081101561003357600080fd5b8101908080519060200190929190505050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061057e806100946000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806360760cec1461003b578063a007117514610107575b600080fd5b6101056004803603604081101561005157600080fd5b81019080803567ffffffffffffffff1690602001909291908035906020019064010000000081111561008257600080fd5b82018360208201111561009457600080fd5b803590602001918460208302840111640100000000831117156100b657600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f8201169050808301925050505050505091929192905050506101d3565b005b6101d16004803603604081101561011d57600080fd5b81019080803567ffffffffffffffff1690602001909291908035906020019064010000000081111561014e57600080fd5b82018360208201111561016057600080fd5b8035906020019184602083028401116401000000008311171561018257600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050919291929050505061029a565b005b60008061020160008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16858561034b565b915091508067ffffffffffffffff1660405160405180910390a1601660030b8214610294576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f546f6b656e206275726e206661696c656400000000000000000000000000000081525060200191505060405180910390fd5b50505050565b6000806102c860008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16858561034b565b91509150601660030b8214610345576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f546f6b656e206275726e206661696c656400000000000000000000000000000081525060200191505060405180910390fd5b50505050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b888888604051602401808473ffffffffffffffffffffffffffffffffffffffff1681526020018367ffffffffffffffff16815260200180602001828103825283818151815260200191508051906020019060200280838360005b838110156103e85780820151818401526020810190506103cd565b50505050905001945050505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106104855780518252602082019150602081019050602083039250610462565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146104e7576040519150601f19603f3d011682016040523d82523d6000602084013e6104ec565b606091505b5091509150816104ff5760156000610530565b80806020019051604081101561051457600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b91508094508195505050505093509391505056fea26469706673582212206ac63042611ff34fb22506530bdedc222968008d59be6461b907ec915fc36c3664736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.json
deleted file mode 100644
index ec56180659ff..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": true,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint64",
-        "name": "totalSupply",
-        "type": "uint64"
-      }
-    ],
-    "name": "BurnedTokenInfo",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnTokenWithEvent",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.bin
deleted file mode 100644
index 255fd2fbc159..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b5060006a636f6e736f6c652e6c6f679050600080600080845afa50506088806100396000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063e1cc0e6d14602d575b600080fd5b60336035565b005b60006a636f6e736f6c652e6c6f679050600080600080845afa505056fea264697066735822122025fa42ec807d7d331b75cc54fed6c8e02806ee60002c6e07db63459eb5d5ee0664736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.json
deleted file mode 100644
index e5273795747e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"callSomebody","outputs":[],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.bin
deleted file mode 100644
index 342532f56c5e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610432806100206000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806357b9fad314610067578063a635f01d1461009d578063c66764e1146100d3578063f55332ab14610109575b600080fd5b61009b600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061013f565b005b6100d1600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506101f1565b005b610107600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102a0565b005b61013d600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610353565b005b6000606060405180807f73746f726556616c75652875696e74323536290000000000000000000000000081525060130190506040518091039020604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050602081825160208401865afa9150505050565b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f726556616c75652875696e743235362900000000000000000000000000815250601301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401600060405180830381865af4925050505050565b8073ffffffffffffffffffffffffffffffffffffffff163460405180807f73746f726556616c75652875696e743235362900000000000000000000000000815250601301905060405180910390207c01000000000000000000000000000000000000000000000000000000009004906040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038185885af293505050505050565b8073ffffffffffffffffffffffffffffffffffffffff163460405180807f73746f726556616c75652875696e743235362900000000000000000000000000815250601301905060405180910390207c01000000000000000000000000000000000000000000000000000000009004906040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038185885af1935050505050505600a165627a7a7230582051414ed741c168410c13281254242bcbaf66580105dd68e2487cb33dbd245d000029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.json
deleted file mode 100644
index 21fab4290f6e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "staticcall",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCall",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callCode",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "call",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.bin
deleted file mode 100644
index 540796486b72..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061046e806100206000396000f300608060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806357b9fad314610067578063a635f01d1461009d578063c66764e1146100d3578063f55332ab14610109575b600080fd5b61009b600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061013f565b005b6100d1600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506101fd565b005b610107600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102bc565b005b61013d600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061037f565b005b6000606060405180807f67657456657273696f6e28290000000000000000000000000000000000000000815250600c0190506040518091039020604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050602081825160208401865afa91508115156101f857600080fd5b505050565b60008173ffffffffffffffffffffffffffffffffffffffff1660405180807f67657456657273696f6e28290000000000000000000000000000000000000000815250600c01905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401600060405180830381865af49250505090508015156102b857600080fd5b5050565b60008173ffffffffffffffffffffffffffffffffffffffff163460405180807f67657456657273696f6e28290000000000000000000000000000000000000000815250600c01905060405180910390207c01000000000000000000000000000000000000000000000000000000009004906040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038185885af29350505050905080151561037b57600080fd5b5050565b60008173ffffffffffffffffffffffffffffffffffffffff163460405180807f67657456657273696f6e28290000000000000000000000000000000000000000815250600c01905060405180910390207c01000000000000000000000000000000000000000000000000000000009004906040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038185885af19350505050905080151561043e57600080fd5b50505600a165627a7a723058206cc8d23e9d7e7ad6c39ec90e9c0bcd8f53befa456a0d3043a5eecccaa5c4578a0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.json
deleted file mode 100644
index 21fab4290f6e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "staticcall",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCall",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callCode",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "call",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.bin
deleted file mode 100644
index e301cc69b328..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610118806100206000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063424cb7f814602d575b600080fd5b603c60383660046075565b603e565b005b6040518181527fe6f250dc95a22400933f5bcd71fc73995f522c0a0b4b8fcdc9719d2ba5fc3a369060200160405180910390a15050565b60008060208385031215608757600080fd5b823567ffffffffffffffff80821115609e57600080fd5b818501915085601f83011260b157600080fd5b81358181111560bf57600080fd5b86602082850101111560d057600080fd5b6020929092019691955090935050505056fea2646970667358221220c13d38cd4c77d0814784de97dbc3338050c79d66c7cf7c756f969b4908066a8f64736f6c634300080d0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.json
deleted file mode 100644
index 3b3f1e3d1425..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "size",
-        "type": "uint256"
-      }
-    ],
-    "name": "Info",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "_calldata",
-        "type": "bytes"
-      }
-    ],
-    "name": "callme",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.bin
deleted file mode 100644
index 152b2a505cd6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506102fb806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063bf40cba914610030575b600080fd5b6100926004803603604081101561004657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610094565b005b60006100a08383610120565b9050601660030b811461011b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e206173736f6369617465206661696c65640000000000000000000081525060200191505060405180910390fd5b505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061021b57805182526020820191506020810190506020830392506101f8565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d806000811461027b576040519150601f19603f3d011682016040523d82523d6000602084013e610280565b606091505b5091509150816102915760156102b8565b8080602001905160208110156102a657600080fd5b81019080805190602001909291905050505b60030b925050509291505056fea2646970667358221220fe7f7c494a6c160d2fd1a553ad40d22f77b96f0b1aabb8bcdc6c94651bf36a7264736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.json
deleted file mode 100644
index a535ae3b8645..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "associate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.bin
deleted file mode 100644
index 545b34d294d4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506101f9806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632eecef751461005c5780633e375eeb146100a9578063c2211f48146100d4575b600080fd5b34801561006857600080fd5b506100a7600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610101565b005b3480156100b557600080fd5b506100be6101ba565b6040518082815260200191505060405180910390f35b3480156100e057600080fd5b506100ff600480360381019080803590602001909291905050506101c3565b005b8173ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f726556616c75652875696e743235362900000000000000000000000000815250601301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004016000604051808303816000875af19250505050806000819055505050565b60008054905090565b80600081905550505600a165627a7a723058200a51122992cedb2479b4fdc474445a7797dfcf28b4d224957e07b9c2684efdc70029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.json
deleted file mode 100644
index bf42b69d684d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_addr",
-        "type": "address"
-      },
-      {
-        "name": "_var1",
-        "type": "uint256"
-      }
-    ],
-    "name": "callContract",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getVar1",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_var1",
-        "type": "uint256"
-      }
-    ],
-    "name": "setVar1",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.bin
deleted file mode 100644
index d682da82a059..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506000469050806000819055505060e78061002c6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063564b81ef146037578063a60ab002146051575b600080fd5b603d606b565b604051604891906098565b60405180910390f35b60576078565b604051606291906098565b60405180910390f35b6000804690508091505090565b60008054905090565b6000819050919050565b6092816081565b82525050565b600060208201905060ab6000830184608b565b9291505056fea2646970667358221220146e23350099480a53125e2b3aa23ca36d0477690b24b386ac8154a2c430b7fe64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.json
deleted file mode 100644
index ccdbe1a61ed6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"getChainID","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getSavedChainID","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.bin
deleted file mode 100644
index 0e761b6b277b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052604960005534801561001557600080fd5b5060405161002290610106565b604051809103906000f08015801561003e573d6000803e3d6000fd5b50600160006002811061004d57fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060405161009890610106565b604051809103906000f0801580156100b4573d6000803e3d6000fd5b50600180600281106100c257fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550610113565b610220806106cf83390190565b6105ad806101226000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c8063149788e71461005c57806321b942e61461009e57806367da9727146100bc5780636af27355146100fe57806376674e671461012c575b600080fd5b6100886004803603602081101561007257600080fd5b810190808035906020019092919050505061016e565b6040518082815260200191505060405180910390f35b6100a66102cd565b6040518082815260200191505060405180910390f35b6100e8600480360360208110156100d257600080fd5b81019080803590602001909291905050506102d6565b6040518082815260200191505060405180910390f35b61012a6004803603602081101561011457600080fd5b810190808035906020019092919050505061038e565b005b61016c6004803603606081101561014257600080fd5b810190808035906020019092919080359060200190929190803590602001909291905050506104cb565b005b6000600160006002811061017e57fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631035561f836040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156101f257600080fd5b505af1158015610206573d6000803e3d6000fd5b505050508160008190555060006001806002811061022057fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ddae15496040518163ffffffff1660e01b815260040160206040518083038186803b15801561028757600080fd5b505afa15801561029b573d6000803e3d6000fd5b505050506040513d60208110156102b157600080fd5b8101908080519060200190929190505050905080915050919050565b60008054905090565b6000600182600281106102e557fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ddae15496040518163ffffffff1660e01b815260040160206040518083038186803b15801561034c57600080fd5b505afa158015610360573d6000803e3d6000fd5b505050506040513d602081101561037657600080fd5b81019080805190602001909291905050509050919050565b600160006002811061039c57fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631035561f826040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b15801561041057600080fd5b505af1158015610424573d6000803e3d6000fd5b505050506001806002811061043557fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631035561f826040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b1580156104a957600080fd5b505af11580156104bd573d6000803e3d6000fd5b505050508060008190555050565b600183600281106104d857fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636e58f57c83836040518363ffffffff1660e01b81526004018083815260200182815260200192505050600060405180830381600087803b15801561055457600080fd5b505af1158015610568573d6000803e3d6000fd5b505050508060008190555050505056fea265627a7a72315820a9cc418a2850161617ab5d2fcc59055e76cde79386e122c5f7bfad676f2fa20764736f6c634300050b00326080604052600060015534801561001557600080fd5b506101fb806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80631035561f146100465780636e58f57c14610074578063ddae1549146100ac575b600080fd5b6100726004803603602081101561005c57600080fd5b81019080803590602001909291905050506100ca565b005b6100aa6004803603604081101561008a57600080fd5b8101908080359060200190929190803590602001909291905050506100e9565b005b6100b4610156565b6040518082815260200191505060405180910390f35b80600080815481106100d857fe5b906000526020600020018190555050565b600082601002905080600154016001819055506000808054905090506001546000816101159190610175565b5060008190505b60015481101561014f57836000828154811061013457fe5b9060005260206000200181905550808060010191505061011c565b5050505050565b60008060008154811061016557fe5b9060005260206000200154905090565b81548183558181111561019c5781836000526020600020918201910161019b91906101a1565b5b505050565b6101c391905b808211156101bf5760008160009055506001016101a7565b5090565b9056fea265627a7a72315820c0afbac713fcd7318e812d089f8e7fb83a518e0e71c55d59a1d5cf1bdaa3d33964736f6c634300050b0032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.json
deleted file mode 100644
index 912d2291dffc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.json
+++ /dev/null
@@ -1,105 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_childId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getChildValue",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_get",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getMyValue",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_get",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_childId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_howManyKB",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "growChild",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "setBoth",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "setZeroReadOne",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_getOne",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.bin
deleted file mode 100644
index 395b4dad9699..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405261042f806100136000396000f3fe6080604052600436106100295760003560e01c8063662049321461002e578063ce8186b9146100e6575b600080fd5b6100e46004803603602081101561004457600080fd5b810190808035906020019064010000000081111561006157600080fd5b82018360208201111561007357600080fd5b8035906020019184602083028401116401000000008311171561009557600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610124565b005b610122600480360360408110156100fc57600080fd5b81019080803563ffffffff169060200190929190803590602001909291905050506101e4565b005b60008090505b81518163ffffffff1610156101e0576000828263ffffffff168151811061014d57fe5b602002602001015167ffffffffffffffff166effffffffffffffffffffffffffffff1690806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050808060010191505061012a565b5050565b6001600080549050116101f657600080fd5b600030905060008363ffffffff168273ffffffffffffffffffffffffffffffffffffffff16318161022357fe5b04905082811115610345576000818373ffffffffffffffffffffffffffffffffffffffff1631039050600061025661034b565b9050600080805490506001830163ffffffff168161027057fe5b0690506000808263ffffffff168154811061028757fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060006001890190508173ffffffffffffffffffffffffffffffffffffffff1663ce8186b98660018c018b6040518463ffffffff1660e01b8152600401808363ffffffff1663ffffffff168152602001828152602001925050506000604051808303818588803b15801561032657600080fd5b505af115801561033a573d6000803e3d6000fd5b505050505050505050505b50505050565b600080600090505b6000805490508163ffffffff1610156103ed573073ffffffffffffffffffffffffffffffffffffffff1660008263ffffffff168154811061039057fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156103e057809150506103f7565b8080600101915050610353565b5060008054905090505b9056fea265627a7a7231582019ceb35bf0ff8b6b905be2b2a342f1e61333aa9039d87639897d4c3e379744ed64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.json
deleted file mode 100644
index 433c812dc16f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "keepAmountDivisor",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "stopBalance",
-        "type": "uint256"
-      }
-    ],
-    "name": "receiveAndSend",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint64[]",
-        "name": "accounts",
-        "type": "uint64[]"
-      }
-    ],
-    "name": "setNodes",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.bin
deleted file mode 100644
index f1957e39ebef..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506105e8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806362538a161461003b5780637c41ad2c14610057575b600080fd5b61005560048036038101906100509190610374565b610087565b005b610071600480360381019061006c91906103b4565b6100d8565b60405161007e91906103fa565b60405180910390f35b600060405161009590610305565b604051809103906000f0801580156100b1573d6000803e3d6000fd5b50905060006100c084846101ed565b9050601660030b81146100d257600080fd5b50505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161010f9190610424565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161017991906104b0565b6000604051808303816000865af19150503d80600081146101b6576040519150601f19603f3d011682016040523d82523d6000602084013e6101bb565b606091505b5091509150816101cc5760156101e1565b808060200190518101906101e09190610500565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161022692919061052d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161029091906104b0565b6000604051808303816000865af19150503d80600081146102cd576040519150601f19603f3d011682016040523d82523d6000602084013e6102d2565b606091505b5091509150816102e35760156102f8565b808060200190518101906102f79190610500565b5b60030b9250505092915050565b605c8061055783390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061034182610316565b9050919050565b61035181610336565b811461035c57600080fd5b50565b60008135905061036e81610348565b92915050565b6000806040838503121561038b5761038a610311565b5b60006103998582860161035f565b92505060206103aa8582860161035f565b9150509250929050565b6000602082840312156103ca576103c9610311565b5b60006103d88482850161035f565b91505092915050565b6000819050919050565b6103f4816103e1565b82525050565b600060208201905061040f60008301846103eb565b92915050565b61041e81610336565b82525050565b60006020820190506104396000830184610415565b92915050565b600081519050919050565b600081905092915050565b60005b83811015610473578082015181840152602081019050610458565b60008484015250505050565b600061048a8261043f565b610494818561044a565b93506104a4818560208601610455565b80840191505092915050565b60006104bc828461047f565b915081905092915050565b60008160030b9050919050565b6104dd816104c7565b81146104e857600080fd5b50565b6000815190506104fa816104d4565b92915050565b60006020828403121561051657610515610311565b5b6000610524848285016104eb565b91505092915050565b60006040820190506105426000830185610415565b61054f6020830184610415565b939250505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212203ec8de0dbaf44d2dbf24fd3a5a258de3cd6bf32b2168e688a44eba7e79ab8c5964736f6c63430008100033a2646970667358221220e32ca27513aa880cb01ff8742104fe16ee68d62615063618bb74a41df7ae115664736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.json
deleted file mode 100644
index 4f5038f58f91..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"tokenAddress","type":"address"}],"name":"createChildThenFailToAssociate","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"pauseToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.bin
deleted file mode 100644
index 3294ec887680..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526000600273ffffffffffffffffffffffffffffffffffffffff166001604051602a9060a9565b60006040518083038185875af1925050503d80600081146065576040519150601f19603f3d011682016040523d82523d6000602084013e606a565b606091505b5050905080607757600080fd5b5060bc565b600081905092915050565b50565b60006095600083607c565b9150609e826087565b600082019050919050565b600060b282608a565b9150819050919050565b603f806100ca6000396000f3fe6080604052600080fdfea26469706673582212202e3dbdaadc75b74c9ba208a4c6c96908ac667757b0d65fd655aa27a769943a0f64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.json
deleted file mode 100644
index 1e0e4702cb5d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"payable","type":"constructor"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.bin
deleted file mode 100644
index 095553eda2ae..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600061016773ffffffffffffffffffffffffffffffffffffffff166001604051602b9060aa565b60006040518083038185875af1925050503d80600081146066576040519150601f19603f3d011682016040523d82523d6000602084013e606b565b606091505b5050905080607857600080fd5b5060bd565b600081905092915050565b50565b60006096600083607d565b9150609f826088565b600082019050919050565b600060b382608b565b9150819050919050565b603f806100cb6000396000f3fe6080604052600080fdfea2646970667358221220c8954bc418cec31160f47872a782f65cf40e0f0489c4b1977afcfa0caaf0628b64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.json
deleted file mode 100644
index 1e0e4702cb5d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"payable","type":"constructor"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.bin
deleted file mode 100644
index c26a45fb899d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610b45806100206000396000f3fe60806040526004361061003f5760003560e01c806381871cbc1461004457806394ca2cb5146100815780639c4ae2d0146100be578063a34d0603146100da575b600080fd5b34801561005057600080fd5b5061006b600480360381019061006691906102fa565b6100f6565b60405161007891906103ca565b60405180910390f35b34801561008d57600080fd5b506100a860048036038101906100a39190610521565b61016c565b6040516100b5919061058c565b60405180910390f35b6100d860048036038101906100d39190610521565b6101b6565b005b6100f460048036038101906100ef9190610521565b61020c565b005b606060006040518060200161010a90610245565b6020820181038252601f19601f8201166040525090508084846040516020016101349291906105b6565b60405160208183030381529060405260405160200161015492919061061b565b60405160208183030381529060405291505092915050565b60008060ff60f81b308486805190602001206040516020016101919493929190610720565b6040516020818303038152906040528051906020012090508060001c91505092915050565b60008183516020850134f59050803b6101ce57600080fd5b7fb03c53b28e78a88e31607a27e1fa48234dce28d5d9d9ec7b295aeb02e674a1e181836040516101ff9291906105b6565b60405180910390a1505050565b60008060023461021c919061079d565b90508284516020860183f591508284516020860183f59150813b61023f57600080fd5b50505050565b610341806107cf83390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061029182610266565b9050919050565b6102a181610286565b81146102ac57600080fd5b50565b6000813590506102be81610298565b92915050565b6000819050919050565b6102d7816102c4565b81146102e257600080fd5b50565b6000813590506102f4816102ce565b92915050565b600080604083850312156103115761031061025c565b5b600061031f858286016102af565b9250506020610330858286016102e5565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610374578082015181840152602081019050610359565b60008484015250505050565b6000601f19601f8301169050919050565b600061039c8261033a565b6103a68185610345565b93506103b6818560208601610356565b6103bf81610380565b840191505092915050565b600060208201905081810360008301526103e48184610391565b905092915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61042e82610380565b810181811067ffffffffffffffff8211171561044d5761044c6103f6565b5b80604052505050565b6000610460610252565b905061046c8282610425565b919050565b600067ffffffffffffffff82111561048c5761048b6103f6565b5b61049582610380565b9050602081019050919050565b82818337600083830152505050565b60006104c46104bf84610471565b610456565b9050828152602081018484840111156104e0576104df6103f1565b5b6104eb8482856104a2565b509392505050565b600082601f830112610508576105076103ec565b5b81356105188482602086016104b1565b91505092915050565b600080604083850312156105385761053761025c565b5b600083013567ffffffffffffffff81111561055657610555610261565b5b610562858286016104f3565b9250506020610573858286016102e5565b9150509250929050565b61058681610286565b82525050565b60006020820190506105a1600083018461057d565b92915050565b6105b0816102c4565b82525050565b60006040820190506105cb600083018561057d565b6105d860208301846105a7565b9392505050565b600081905092915050565b60006105f58261033a565b6105ff81856105df565b935061060f818560208601610356565b80840191505092915050565b600061062782856105ea565b915061063382846105ea565b91508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b6106866106818261063f565b61066b565b82525050565b60008160601b9050919050565b60006106a48261068c565b9050919050565b60006106b682610699565b9050919050565b6106ce6106c982610286565b6106ab565b82525050565b6000819050919050565b6106ef6106ea826102c4565b6106d4565b82525050565b6000819050919050565b6000819050919050565b61071a610715826106f5565b6106ff565b82525050565b600061072c8287610675565b60018201915061073c82866106bd565b60148201915061074c82856106de565b60208201915061075c8284610709565b60208201915081905095945050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b60006107a8826102c4565b91506107b3836102c4565b9250826107c3576107c261076e565b5b82820490509291505056fe60806040526040516103413803806103418339818101604052810190610025919061010c565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061014c565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a382610078565b9050919050565b6100b381610098565b81146100be57600080fd5b50565b6000815190506100d0816100aa565b92915050565b6000819050919050565b6100e9816100d6565b81146100f457600080fd5b50565b600081519050610106816100e0565b92915050565b6000806040838503121561012357610122610073565b5b6000610131858286016100c1565b9250506020610142858286016100f7565b9150509250929050565b6101e68061015b6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806312065fe014610051578063737bc3c91461006f5780638da5cb5b14610079578063c298557814610097575b600080fd5b6100596100b5565b6040516100669190610139565b60405180910390f35b6100776100bd565b005b6100816100f6565b60405161008e9190610195565b60405180910390f35b61009f61011a565b6040516100ac9190610139565b60405180910390f35b600047905090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b6000819050919050565b61013381610120565b82525050565b600060208201905061014e600083018461012a565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061017f82610154565b9050919050565b61018f81610174565b82525050565b60006020820190506101aa6000830184610186565b9291505056fea2646970667358221220c0012e8fedb69e0ae82512f8860411b4393372d8516c58d86d036cb43a5918ab64736f6c63430008110033a26469706673582212202e75efea6a059cbe6d9da5d32b875c457ca139f7868a9313217c66d4576fee1064736f6c63430008110033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.json
deleted file mode 100644
index 36204d7f6fa6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.json
+++ /dev/null
@@ -1,105 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "addr",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deployed",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "deploy",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "getAddress",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_foo",
-        "type": "uint256"
-      }
-    ],
-    "name": "getBytecode",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "wronglyDeployTwice",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.bin
deleted file mode 100644
index 3fcf8875b06a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610d27806100206000396000f3fe608060405260043610620000385760003560e01c806381871cbc146200003d57806394ca2cb514620000815780639c4ae2d014620000c5575b600080fd5b3480156200004a57600080fd5b50620000696004803603810190620000639190620002c8565b620000e5565b604051620000789190620003b3565b60405180910390f35b3480156200008e57600080fd5b50620000ad6004803603810190620000a7919062000528565b62000161565b604051620000bc91906200059f565b60405180910390f35b620000e36004803603810190620000dd919062000528565b620001ad565b005b6060600060405180602001620000fb9062000206565b6020820181038252601f19601f82011660405250905080848460405160200162000127929190620005cd565b604051602081830303815290604052604051602001620001499291906200063c565b60405160208183030381529060405291505092915050565b60008060ff60f81b3084868051906020012060405160200162000188949392919062000759565b6040516020818303038152906040528051906020012090508060001c91505092915050565b60008183516020850134f59050803b620001c657600080fd5b7fb03c53b28e78a88e31607a27e1fa48234dce28d5d9d9ec7b295aeb02e674a1e18183604051620001f9929190620005cd565b60405180910390a1505050565b61054280620007b083390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620002558262000228565b9050919050565b620002678162000248565b81146200027357600080fd5b50565b60008135905062000287816200025c565b92915050565b6000819050919050565b620002a2816200028d565b8114620002ae57600080fd5b50565b600081359050620002c28162000297565b92915050565b60008060408385031215620002e257620002e16200021e565b5b6000620002f28582860162000276565b92505060206200030585828601620002b1565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b60005b838110156200034b5780820151818401526020810190506200032e565b838111156200035b576000848401525b50505050565b6000601f19601f8301169050919050565b60006200037f826200030f565b6200038b81856200031a565b93506200039d8185602086016200032b565b620003a88162000361565b840191505092915050565b60006020820190508181036000830152620003cf818462000372565b905092915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200041b8262000361565b810181811067ffffffffffffffff821117156200043d576200043c620003e1565b5b80604052505050565b60006200045262000214565b905062000460828262000410565b919050565b600067ffffffffffffffff821115620004835762000482620003e1565b5b6200048e8262000361565b9050602081019050919050565b82818337600083830152505050565b6000620004c1620004bb8462000465565b62000446565b905082815260208101848484011115620004e057620004df620003dc565b5b620004ed8482856200049b565b509392505050565b600082601f8301126200050d576200050c620003d7565b5b81356200051f848260208601620004aa565b91505092915050565b600080604083850312156200054257620005416200021e565b5b600083013567ffffffffffffffff81111562000563576200056262000223565b5b6200057185828601620004f5565b92505060206200058485828601620002b1565b9150509250929050565b620005998162000248565b82525050565b6000602082019050620005b660008301846200058e565b92915050565b620005c7816200028d565b82525050565b6000604082019050620005e460008301856200058e565b620005f36020830184620005bc565b9392505050565b600081905092915050565b600062000612826200030f565b6200061e8185620005fa565b9350620006308185602086016200032b565b80840191505092915050565b60006200064a828562000605565b915062000658828462000605565b91508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b620006af620006a98262000664565b62000690565b82525050565b60008160601b9050919050565b6000620006cf82620006b5565b9050919050565b6000620006e382620006c2565b9050919050565b620006ff620006f98262000248565b620006d6565b82525050565b6000819050919050565b620007246200071e826200028d565b62000705565b82525050565b6000819050919050565b6000819050919050565b620007536200074d826200072a565b62000734565b82525050565b60006200076782876200069a565b600182019150620007798286620006ea565b6014820191506200078b82856200070f565b6020820191506200079d82846200073e565b6020820191508190509594505050505056fe60806040526040516105423803806105428339818101604052810190610025919061022a565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550600060405161007a90610185565b6100849190610289565b604051809103906000f0801580156100a0573d6000803e3d6000fd5b5060026000600281106100b6576100b56102a4565b5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600160405161010390610185565b61010d9190610289565b604051809103906000f080158015610129573d6000803e3d6000fd5b50600260016002811061013f5761013e6102a4565b5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050506102d3565b60f98061044983390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101c182610196565b9050919050565b6101d1816101b6565b81146101dc57600080fd5b50565b6000815190506101ee816101c8565b92915050565b6000819050919050565b610207816101f4565b811461021257600080fd5b50565b600081519050610224816101fe565b92915050565b6000806040838503121561024157610240610191565b5b600061024f858286016101df565b925050602061026085828601610215565b9150509250929050565b600063ffffffff82169050919050565b6102838161026a565b82525050565b600060208201905061029e600083018461027a565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b610167806102e26000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80638da5cb5b1461003b578063c298557814610059575b600080fd5b610043610077565b60405161005091906100e2565b60405180910390f35b61006161009b565b60405161006e9190610116565b60405180910390f35b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100cc826100a1565b9050919050565b6100dc816100c1565b82525050565b60006020820190506100f760008301846100d3565b92915050565b6000819050919050565b610110816100fd565b82525050565b600060208201905061012b6000830184610107565b9291505056fea2646970667358221220e73b38e42708ab24f27f041c3b09eb3884c7268e58662734e6938eaa25ae6c2164736f6c634300080a003360806040526040516100f93803806100f98339818101604052810190602391906084565b806000806101000a81548163ffffffff021916908363ffffffff1602179055505060ac565b600080fd5b600063ffffffff82169050919050565b606481604d565b8114606e57600080fd5b50565b600081519050607e81605d565b92915050565b60006020828403121560975760966048565b5b600060a3848285016071565b91505092915050565b603f806100ba6000396000f3fe6080604052600080fdfea2646970667358221220d7cb926d0609b3e966bde81a57581090475fdd1e886d828257ddf91c3f722b8a64736f6c634300080a0033a264697066735822122034e914e3fbad79ef8984844f8dbe1806fec5084470b2b366581329b5247afc4364736f6c634300080a0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.json
deleted file mode 100644
index 4a30e43cfe80..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-	{
-		"anonymous": false,
-		"inputs": [
-			{
-				"indexed": false,
-				"internalType": "address",
-				"name": "addr",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "salt",
-				"type": "uint256"
-			}
-		],
-		"name": "Deployed",
-		"type": "event"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "bytes",
-				"name": "bytecode",
-				"type": "bytes"
-			},
-			{
-				"internalType": "uint256",
-				"name": "_salt",
-				"type": "uint256"
-			}
-		],
-		"name": "deploy",
-		"outputs": [],
-		"stateMutability": "payable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "bytes",
-				"name": "bytecode",
-				"type": "bytes"
-			},
-			{
-				"internalType": "uint256",
-				"name": "_salt",
-				"type": "uint256"
-			}
-		],
-		"name": "getAddress",
-		"outputs": [
-			{
-				"internalType": "address",
-				"name": "",
-				"type": "address"
-			}
-		],
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "_owner",
-				"type": "address"
-			},
-			{
-				"internalType": "uint256",
-				"name": "_foo",
-				"type": "uint256"
-			}
-		],
-		"name": "getBytecode",
-		"outputs": [
-			{
-				"internalType": "bytes",
-				"name": "",
-				"type": "bytes"
-			}
-		],
-		"stateMutability": "pure",
-		"type": "function"
-	}
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.bin
deleted file mode 100644
index 35e454d940cd..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50612802806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c8063425dbf961461005c57806367d731d31461008c578063707c5019146100bc578063abf7bfd8146100d8578063ca972161146100f4575b600080fd5b610076600480360381019061007191906109a1565b610110565b60405161008391906109fa565b60405180910390f35b6100a660048036038101906100a191906109a1565b610146565b6040516100b391906109fa565b60405180910390f35b6100d660048036038101906100d19190610a15565b61017c565b005b6100f260048036038101906100ed9190610a78565b61025f565b005b61010e60048036038101906101099190610a15565b6103a9565b005b600061013e833060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168561048c565b905092915050565b6000610174833060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856105aa565b905092915050565b600061018830836106c8565b9050601660030b81146101d0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101c790610b02565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d9425403836040518263ffffffff1660e01b81526004016102299190610b31565b600060405180830381600087803b15801561024357600080fd5b505af1158015610257573d6000803e3d6000fd5b505050505050565b600060ff60f81b308360405180602001610278906108f8565b6020820181038252601f19601f8201166040525060405160200161029c9190610bc6565b604051602081830303815290604052805190602001206040516020016102c59493929190610c93565b6040516020818303038152906040528051906020012060001c9050816040516102ed906108f8565b8190604051809103906000f590508015801561030d573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146103a557600080fd5b5050565b60006103b530836107e0565b9050601660030b81146103fd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103f490610d2d565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663ea58ce21836040518263ffffffff1660e01b81526004016104569190610b31565b600060405180830381600087803b15801561047057600080fd5b505af1158015610484573d6000803e3d6000fd5b505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b888888886040516024016104c99493929190610d5c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105339190610bc6565b6000604051808303816000865af19150503d8060008114610570576040519150601f19603f3d011682016040523d82523d6000602084013e610575565b606091505b50915091508161058657601561059b565b8080602001905181019061059a9190610dda565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016105e79493929190610d5c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106519190610bc6565b6000604051808303816000865af19150503d806000811461068e576040519150601f19603f3d011682016040523d82523d6000602084013e610693565b606091505b5091509150816106a45760156106b9565b808060200190518101906106b89190610dda565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663099794e860e01b8686604051602401610701929190610e07565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161076b9190610bc6565b6000604051808303816000865af19150503d80600081146107a8576040519150601f19603f3d011682016040523d82523d6000602084013e6107ad565b606091505b5091509150816107be5760156107d3565b808060200190518101906107d29190610dda565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401610819929190610e07565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108839190610bc6565b6000604051808303816000865af19150503d80600081146108c0576040519150601f19603f3d011682016040523d82523d6000602084013e6108c5565b606091505b5091509150816108d65760156108eb565b808060200190518101906108ea9190610dda565b5b60030b9250505092915050565b61199c80610e3183390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006109358261090a565b9050919050565b6109458161092a565b811461095057600080fd5b50565b6000813590506109628161093c565b92915050565b60008160070b9050919050565b61097e81610968565b811461098957600080fd5b50565b60008135905061099b81610975565b92915050565b600080604083850312156109b8576109b7610905565b5b60006109c685828601610953565b92505060206109d78582860161098c565b9150509250929050565b6000819050919050565b6109f4816109e1565b82525050565b6000602082019050610a0f60008301846109eb565b92915050565b600060208284031215610a2b57610a2a610905565b5b6000610a3984828501610953565b91505092915050565b6000819050919050565b610a5581610a42565b8114610a6057600080fd5b50565b600081359050610a7281610a4c565b92915050565b600060208284031215610a8e57610a8d610905565b5b6000610a9c84828501610a63565b91505092915050565b600082825260208201905092915050565b7f4e6576657220656e64732077656c6c2e00000000000000000000000000000000600082015250565b6000610aec601083610aa5565b9150610af782610ab6565b602082019050919050565b60006020820190508181036000830152610b1b81610adf565b9050919050565b610b2b8161092a565b82525050565b6000602082019050610b466000830184610b22565b92915050565b600081519050919050565b600081905092915050565b60005b83811015610b80578082015181840152602081019050610b65565b83811115610b8f576000848401525b50505050565b6000610ba082610b4c565b610baa8185610b57565b9350610bba818560208601610b62565b80840191505092915050565b6000610bd28284610b95565b915081905092915050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b610c24610c1f82610bdd565b610c09565b82525050565b60008160601b9050919050565b6000610c4282610c2a565b9050919050565b6000610c5482610c37565b9050919050565b610c6c610c678261092a565b610c49565b82525050565b6000819050919050565b610c8d610c8882610a42565b610c72565b82525050565b6000610c9f8287610c13565b600182019150610caf8286610c5b565b601482019150610cbf8285610c7c565b602082019150610ccf8284610c7c565b60208201915081905095945050505050565b7f57656c6c2c2049206e6576657221000000000000000000000000000000000000600082015250565b6000610d17600e83610aa5565b9150610d2282610ce1565b602082019050919050565b60006020820190508181036000830152610d4681610d0a565b9050919050565b610d5681610968565b82525050565b6000608082019050610d716000830187610b22565b610d7e6020830186610b22565b610d8b6040830185610b22565b610d986060830184610d4d565b95945050505050565b60008160030b9050919050565b610db781610da1565b8114610dc257600080fd5b50565b600081519050610dd481610dae565b92915050565b600060208284031215610df057610def610905565b5b6000610dfe84828501610dc5565b91505092915050565b6000604082019050610e1c6000830185610b22565b610e296020830184610b22565b939250505056fe608060405234801561001057600080fd5b5061197c806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630a284cb614610051578063484a95a91461006d578063d942540314610089578063ea58ce21146100a5575b600080fd5b61006b60048036038101906100669190610939565b6100c1565b005b61008760048036038101906100829190610939565b610125565b005b6100a3600480360381019061009e9190610995565b610236565b005b6100bf60048036038101906100ba9190610995565b61028e565b005b60008060006100d2856000866102e6565b925092509250601660030b831461011e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161011590610a1f565b60405180910390fd5b5050505050565b60006040516101339061068e565b604051809103906000f08015801561014f573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff16630a284cb660e01b8484604051602401610184929190610b98565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101ee9190610c04565b600060405180830381855af49150503d8060008114610229576040519150601f19603f3d011682016040523d82523d6000602084013e61022e565b606091505b505050505050565b6000610242308361045e565b9050601660030b811461028a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161028190610c67565b60405180910390fd5b5050565b600061029a3083610576565b9050601660030b81146102e2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102d990610cd3565b60405180910390fd5b5050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161032493929190610d16565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161038e9190610c04565b6000604051808303816000865af19150503d80600081146103cb576040519150601f19603f3d011682016040523d82523d6000602084013e6103d0565b606091505b50915091508161042c57601560008067ffffffffffffffff8111156103f8576103f7610723565b5b6040519080825280602002602001820160405280156104265781602001602082028036833780820191505090505b50610441565b808060200190518101906104409190610eb2565b5b8260030b9250809550819650829750505050505093509350939050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663099794e860e01b8686604051602401610497929190610f21565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105019190610c04565b6000604051808303816000865af19150503d806000811461053e576040519150601f19603f3d011682016040523d82523d6000602084013e610543565b606091505b509150915081610554576015610569565b808060200190518101906105689190610f4a565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016105af929190610f21565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106199190610c04565b6000604051808303816000865af19150503d8060008114610656576040519150601f19603f3d011682016040523d82523d6000602084013e61065b565b606091505b50915091508161066c576015610681565b808060200190518101906106809190610f4a565b5b60030b9250505092915050565b6109cf80610f7883390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006106da826106af565b9050919050565b6106ea816106cf565b81146106f557600080fd5b50565b600081359050610707816106e1565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61075b82610712565b810181811067ffffffffffffffff8211171561077a57610779610723565b5b80604052505050565b600061078d61069b565b90506107998282610752565b919050565b600067ffffffffffffffff8211156107b9576107b8610723565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff8211156107ef576107ee610723565b5b6107f882610712565b9050602081019050919050565b82818337600083830152505050565b6000610827610822846107d4565b610783565b905082815260208101848484011115610843576108426107cf565b5b61084e848285610805565b509392505050565b600082601f83011261086b5761086a61070d565b5b813561087b848260208601610814565b91505092915050565b60006108976108928461079e565b610783565b905080838252602082019050602084028301858111156108ba576108b96107ca565b5b835b8181101561090157803567ffffffffffffffff8111156108df576108de61070d565b5b8086016108ec8982610856565b855260208501945050506020810190506108bc565b5050509392505050565b600082601f8301126109205761091f61070d565b5b8135610930848260208601610884565b91505092915050565b600080604083850312156109505761094f6106a5565b5b600061095e858286016106f8565b925050602083013567ffffffffffffffff81111561097f5761097e6106aa565b5b61098b8582860161090b565b9150509250929050565b6000602082840312156109ab576109aa6106a5565b5b60006109b9848285016106f8565b91505092915050565b600082825260208201905092915050565b7f43616e2774210000000000000000000000000000000000000000000000000000600082015250565b6000610a096006836109c2565b9150610a14826109d3565b602082019050919050565b60006020820190508181036000830152610a38816109fc565b9050919050565b610a48816106cf565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610ab4578082015181840152602081019050610a99565b83811115610ac3576000848401525b50505050565b6000610ad482610a7a565b610ade8185610a85565b9350610aee818560208601610a96565b610af781610712565b840191505092915050565b6000610b0e8383610ac9565b905092915050565b6000602082019050919050565b6000610b2e82610a4e565b610b388185610a59565b935083602082028501610b4a85610a6a565b8060005b85811015610b865784840389528151610b678582610b02565b9450610b7283610b16565b925060208a01995050600181019050610b4e565b50829750879550505050505092915050565b6000604082019050610bad6000830185610a3f565b8181036020830152610bbf8184610b23565b90509392505050565b600081905092915050565b6000610bde82610a7a565b610be88185610bc8565b9350610bf8818560208601610a96565b80840191505092915050565b6000610c108284610bd3565b915081905092915050565b7f536f20756e666169720000000000000000000000000000000000000000000000600082015250565b6000610c516009836109c2565b9150610c5c82610c1b565b602082019050919050565b60006020820190508181036000830152610c8081610c44565b9050919050565b7f4974277320756e6865617264206f662e2e2e0000000000000000000000000000600082015250565b6000610cbd6012836109c2565b9150610cc882610c87565b602082019050919050565b60006020820190508181036000830152610cec81610cb0565b9050919050565b600067ffffffffffffffff82169050919050565b610d1081610cf3565b82525050565b6000606082019050610d2b6000830186610a3f565b610d386020830185610d07565b8181036040830152610d4a8184610b23565b9050949350505050565b60008160030b9050919050565b610d6a81610d54565b8114610d7557600080fd5b50565b600081519050610d8781610d61565b92915050565b610d9681610cf3565b8114610da157600080fd5b50565b600081519050610db381610d8d565b92915050565b600067ffffffffffffffff821115610dd457610dd3610723565b5b602082029050602081019050919050565b6000819050919050565b610df881610de5565b8114610e0357600080fd5b50565b600081519050610e1581610def565b92915050565b6000610e2e610e2984610db9565b610783565b90508083825260208201905060208402830185811115610e5157610e506107ca565b5b835b81811015610e7a5780610e668882610e06565b845260208401935050602081019050610e53565b5050509392505050565b600082601f830112610e9957610e9861070d565b5b8151610ea9848260208601610e1b565b91505092915050565b600080600060608486031215610ecb57610eca6106a5565b5b6000610ed986828701610d78565b9350506020610eea86828701610da4565b925050604084015167ffffffffffffffff811115610f0b57610f0a6106aa565b5b610f1786828701610e84565b9150509250925092565b6000604082019050610f366000830185610a3f565b610f436020830184610a3f565b9392505050565b600060208284031215610f6057610f5f6106a5565b5b6000610f6e84828501610d78565b9150509291505056fe608060405234801561001057600080fd5b506109af806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630a284cb614610030575b600080fd5b61004a600480360381019061004591906104c6565b61004c565b005b600080600061005d856000866100b0565b925092509250601660030b83146100a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100a09061057f565b60405180910390fd5b5050505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016100ee9392919061071b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101589190610795565b6000604051808303816000865af19150503d8060008114610195576040519150601f19603f3d011682016040523d82523d6000602084013e61019a565b606091505b5091509150816101f657601560008067ffffffffffffffff8111156101c2576101c16102b0565b5b6040519080825280602002602001820160405280156101f05781602001602082028036833780820191505090505b5061020b565b8080602001905181019061020a919061090a565b5b8260030b9250809550819650829750505050505093509350939050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102678261023c565b9050919050565b6102778161025c565b811461028257600080fd5b50565b6000813590506102948161026e565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6102e88261029f565b810181811067ffffffffffffffff82111715610307576103066102b0565b5b80604052505050565b600061031a610228565b905061032682826102df565b919050565b600067ffffffffffffffff821115610346576103456102b0565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff82111561037c5761037b6102b0565b5b6103858261029f565b9050602081019050919050565b82818337600083830152505050565b60006103b46103af84610361565b610310565b9050828152602081018484840111156103d0576103cf61035c565b5b6103db848285610392565b509392505050565b600082601f8301126103f8576103f761029a565b5b81356104088482602086016103a1565b91505092915050565b600061042461041f8461032b565b610310565b9050808382526020820190506020840283018581111561044757610446610357565b5b835b8181101561048e57803567ffffffffffffffff81111561046c5761046b61029a565b5b80860161047989826103e3565b85526020850194505050602081019050610449565b5050509392505050565b600082601f8301126104ad576104ac61029a565b5b81356104bd848260208601610411565b91505092915050565b600080604083850312156104dd576104dc610232565b5b60006104eb85828601610285565b925050602083013567ffffffffffffffff81111561050c5761050b610237565b5b61051885828601610498565b9150509250929050565b600082825260208201905092915050565b7f43616e2774206576656e21000000000000000000000000000000000000000000600082015250565b6000610569600b83610522565b915061057482610533565b602082019050919050565b600060208201905081810360008301526105988161055c565b9050919050565b6105a88161025c565b82525050565b600067ffffffffffffffff82169050919050565b6105cb816105ae565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561063757808201518184015260208101905061061c565b83811115610646576000848401525b50505050565b6000610657826105fd565b6106618185610608565b9350610671818560208601610619565b61067a8161029f565b840191505092915050565b6000610691838361064c565b905092915050565b6000602082019050919050565b60006106b1826105d1565b6106bb81856105dc565b9350836020820285016106cd856105ed565b8060005b8581101561070957848403895281516106ea8582610685565b94506106f583610699565b925060208a019950506001810190506106d1565b50829750879550505050505092915050565b6000606082019050610730600083018661059f565b61073d60208301856105c2565b818103604083015261074f81846106a6565b9050949350505050565b600081905092915050565b600061076f826105fd565b6107798185610759565b9350610789818560208601610619565b80840191505092915050565b60006107a18284610764565b915081905092915050565b60008160030b9050919050565b6107c2816107ac565b81146107cd57600080fd5b50565b6000815190506107df816107b9565b92915050565b6107ee816105ae565b81146107f957600080fd5b50565b60008151905061080b816107e5565b92915050565b600067ffffffffffffffff82111561082c5761082b6102b0565b5b602082029050602081019050919050565b6000819050919050565b6108508161083d565b811461085b57600080fd5b50565b60008151905061086d81610847565b92915050565b600061088661088184610811565b610310565b905080838252602082019050602084028301858111156108a9576108a8610357565b5b835b818110156108d257806108be888261085e565b8452602084019350506020810190506108ab565b5050509392505050565b600082601f8301126108f1576108f061029a565b5b8151610901848260208601610873565b91505092915050565b60008060006060848603121561092357610922610232565b5b6000610931868287016107d0565b9350506020610942868287016107fc565b925050604084015167ffffffffffffffff81111561096357610962610237565b5b61096f868287016108dc565b915050925092509256fea2646970667358221220a3dff902d886cff453e661d2803820ae26ab4f45a48fa31950bd031f08d3ebac64736f6c634300080c0033a26469706673582212205504591823024854420658d49458b4aed84ef2afae28989e0315687f59914b3f64736f6c634300080c0033a2646970667358221220990440ea342f9c8311aa9396d964bc23dcb5626625f50c0f2d6f3e7808433ce664736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.json
deleted file mode 100644
index b66da22cd5df..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.json
+++ /dev/null
@@ -1,89 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      }
-    ],
-    "name": "associateBothTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "createUser",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateBothFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "ft_type",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "sendFtToUser",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "nft_type",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "sn",
-        "type": "int64"
-      }
-    ],
-    "name": "sendNftToUser",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.bin
deleted file mode 100644
index c4d260362dbe..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506108b8806100206000396000f3fe6080604052600436106100345760003560e01c806381871cbc1461003957806394ca2cb5146100765780639c4ae2d0146100b3575b600080fd5b34801561004557600080fd5b50610060600480360381019061005b919061028f565b6100cf565b60405161006d919061035f565b60405180910390f35b34801561008257600080fd5b5061009d600480360381019061009891906104b6565b610145565b6040516100aa9190610521565b60405180910390f35b6100cd60048036038101906100c891906104b6565b61018f565b005b60606000604051806020016100e3906101da565b6020820181038252601f19601f82011660405250905080848460405160200161010d92919061054b565b60405160208183030381529060405260405160200161012d9291906105b0565b60405160208183030381529060405291505092915050565b60008060ff60f81b3084868051906020012060405160200161016a94939291906106b5565b6040516020818303038152906040528051906020012090508060001c91505092915050565b60008183516020850134f590507fb03c53b28e78a88e31607a27e1fa48234dce28d5d9d9ec7b295aeb02e674a1e181836040516101cd92919061054b565b60405180910390a1505050565b61017f8061070483390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610226826101fb565b9050919050565b6102368161021b565b811461024157600080fd5b50565b6000813590506102538161022d565b92915050565b6000819050919050565b61026c81610259565b811461027757600080fd5b50565b60008135905061028981610263565b92915050565b600080604083850312156102a6576102a56101f1565b5b60006102b485828601610244565b92505060206102c58582860161027a565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b60005b838110156103095780820151818401526020810190506102ee565b60008484015250505050565b6000601f19601f8301169050919050565b6000610331826102cf565b61033b81856102da565b935061034b8185602086016102eb565b61035481610315565b840191505092915050565b600060208201905081810360008301526103798184610326565b905092915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6103c382610315565b810181811067ffffffffffffffff821117156103e2576103e161038b565b5b80604052505050565b60006103f56101e7565b905061040182826103ba565b919050565b600067ffffffffffffffff8211156104215761042061038b565b5b61042a82610315565b9050602081019050919050565b82818337600083830152505050565b600061045961045484610406565b6103eb565b90508281526020810184848401111561047557610474610386565b5b610480848285610437565b509392505050565b600082601f83011261049d5761049c610381565b5b81356104ad848260208601610446565b91505092915050565b600080604083850312156104cd576104cc6101f1565b5b600083013567ffffffffffffffff8111156104eb576104ea6101f6565b5b6104f785828601610488565b92505060206105088582860161027a565b9150509250929050565b61051b8161021b565b82525050565b60006020820190506105366000830184610512565b92915050565b61054581610259565b82525050565b60006040820190506105606000830185610512565b61056d602083018461053c565b9392505050565b600081905092915050565b600061058a826102cf565b6105948185610574565b93506105a48185602086016102eb565b80840191505092915050565b60006105bc828561057f565b91506105c8828461057f565b91508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b61061b610616826105d4565b610600565b82525050565b60008160601b9050919050565b600061063982610621565b9050919050565b600061064b8261062e565b9050919050565b61066361065e8261021b565b610640565b82525050565b6000819050919050565b61068461067f82610259565b610669565b82525050565b6000819050919050565b6000819050919050565b6106af6106aa8261068a565b610694565b82525050565b60006106c1828761060a565b6001820191506106d18286610652565b6014820191506106e18285610673565b6020820191506106f1828461069e565b6020820191508190509594505050505056fe608060405260405161017f38038061017f8339818101604052810190610025919061013e565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508060018190555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100d5826100aa565b9050919050565b6100e5816100ca565b81146100f057600080fd5b50565b600081519050610102816100dc565b92915050565b6000819050919050565b61011b81610108565b811461012657600080fd5b50565b60008151905061013881610112565b92915050565b60008060408385031215610155576101546100a5565b5b6000610163858286016100f3565b925050602061017485828601610129565b915050925092905056fea2646970667358221220e153333d92557f0299a7a37f3835c04b5cc06faec36534cf64848b9f0f54e6f964736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.json
deleted file mode 100644
index a48ca4e92f5c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.json
+++ /dev/null
@@ -1,87 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "addr",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deployed",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "deploy",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "getAddress",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_foo",
-        "type": "uint256"
-      }
-    ],
-    "name": "getBytecode",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.bin
deleted file mode 100644
index 80e94e1dcc3b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061197c806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630a284cb614610051578063484a95a91461006d578063d942540314610089578063ea58ce21146100a5575b600080fd5b61006b60048036038101906100669190610939565b6100c1565b005b61008760048036038101906100829190610939565b610125565b005b6100a3600480360381019061009e9190610995565b610236565b005b6100bf60048036038101906100ba9190610995565b61028e565b005b60008060006100d2856000866102e6565b925092509250601660030b831461011e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161011590610a1f565b60405180910390fd5b5050505050565b60006040516101339061068e565b604051809103906000f08015801561014f573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff16630a284cb660e01b8484604051602401610184929190610b98565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101ee9190610c04565b600060405180830381855af49150503d8060008114610229576040519150601f19603f3d011682016040523d82523d6000602084013e61022e565b606091505b505050505050565b6000610242308361045e565b9050601660030b811461028a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161028190610c67565b60405180910390fd5b5050565b600061029a3083610576565b9050601660030b81146102e2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102d990610cd3565b60405180910390fd5b5050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161032493929190610d16565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161038e9190610c04565b6000604051808303816000865af19150503d80600081146103cb576040519150601f19603f3d011682016040523d82523d6000602084013e6103d0565b606091505b50915091508161042c57601560008067ffffffffffffffff8111156103f8576103f7610723565b5b6040519080825280602002602001820160405280156104265781602001602082028036833780820191505090505b50610441565b808060200190518101906104409190610eb2565b5b8260030b9250809550819650829750505050505093509350939050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663099794e860e01b8686604051602401610497929190610f21565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105019190610c04565b6000604051808303816000865af19150503d806000811461053e576040519150601f19603f3d011682016040523d82523d6000602084013e610543565b606091505b509150915081610554576015610569565b808060200190518101906105689190610f4a565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016105af929190610f21565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106199190610c04565b6000604051808303816000865af19150503d8060008114610656576040519150601f19603f3d011682016040523d82523d6000602084013e61065b565b606091505b50915091508161066c576015610681565b808060200190518101906106809190610f4a565b5b60030b9250505092915050565b6109cf80610f7883390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006106da826106af565b9050919050565b6106ea816106cf565b81146106f557600080fd5b50565b600081359050610707816106e1565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61075b82610712565b810181811067ffffffffffffffff8211171561077a57610779610723565b5b80604052505050565b600061078d61069b565b90506107998282610752565b919050565b600067ffffffffffffffff8211156107b9576107b8610723565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff8211156107ef576107ee610723565b5b6107f882610712565b9050602081019050919050565b82818337600083830152505050565b6000610827610822846107d4565b610783565b905082815260208101848484011115610843576108426107cf565b5b61084e848285610805565b509392505050565b600082601f83011261086b5761086a61070d565b5b813561087b848260208601610814565b91505092915050565b60006108976108928461079e565b610783565b905080838252602082019050602084028301858111156108ba576108b96107ca565b5b835b8181101561090157803567ffffffffffffffff8111156108df576108de61070d565b5b8086016108ec8982610856565b855260208501945050506020810190506108bc565b5050509392505050565b600082601f8301126109205761091f61070d565b5b8135610930848260208601610884565b91505092915050565b600080604083850312156109505761094f6106a5565b5b600061095e858286016106f8565b925050602083013567ffffffffffffffff81111561097f5761097e6106aa565b5b61098b8582860161090b565b9150509250929050565b6000602082840312156109ab576109aa6106a5565b5b60006109b9848285016106f8565b91505092915050565b600082825260208201905092915050565b7f43616e2774210000000000000000000000000000000000000000000000000000600082015250565b6000610a096006836109c2565b9150610a14826109d3565b602082019050919050565b60006020820190508181036000830152610a38816109fc565b9050919050565b610a48816106cf565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610ab4578082015181840152602081019050610a99565b83811115610ac3576000848401525b50505050565b6000610ad482610a7a565b610ade8185610a85565b9350610aee818560208601610a96565b610af781610712565b840191505092915050565b6000610b0e8383610ac9565b905092915050565b6000602082019050919050565b6000610b2e82610a4e565b610b388185610a59565b935083602082028501610b4a85610a6a565b8060005b85811015610b865784840389528151610b678582610b02565b9450610b7283610b16565b925060208a01995050600181019050610b4e565b50829750879550505050505092915050565b6000604082019050610bad6000830185610a3f565b8181036020830152610bbf8184610b23565b90509392505050565b600081905092915050565b6000610bde82610a7a565b610be88185610bc8565b9350610bf8818560208601610a96565b80840191505092915050565b6000610c108284610bd3565b915081905092915050565b7f536f20756e666169720000000000000000000000000000000000000000000000600082015250565b6000610c516009836109c2565b9150610c5c82610c1b565b602082019050919050565b60006020820190508181036000830152610c8081610c44565b9050919050565b7f4974277320756e6865617264206f662e2e2e0000000000000000000000000000600082015250565b6000610cbd6012836109c2565b9150610cc882610c87565b602082019050919050565b60006020820190508181036000830152610cec81610cb0565b9050919050565b600067ffffffffffffffff82169050919050565b610d1081610cf3565b82525050565b6000606082019050610d2b6000830186610a3f565b610d386020830185610d07565b8181036040830152610d4a8184610b23565b9050949350505050565b60008160030b9050919050565b610d6a81610d54565b8114610d7557600080fd5b50565b600081519050610d8781610d61565b92915050565b610d9681610cf3565b8114610da157600080fd5b50565b600081519050610db381610d8d565b92915050565b600067ffffffffffffffff821115610dd457610dd3610723565b5b602082029050602081019050919050565b6000819050919050565b610df881610de5565b8114610e0357600080fd5b50565b600081519050610e1581610def565b92915050565b6000610e2e610e2984610db9565b610783565b90508083825260208201905060208402830185811115610e5157610e506107ca565b5b835b81811015610e7a5780610e668882610e06565b845260208401935050602081019050610e53565b5050509392505050565b600082601f830112610e9957610e9861070d565b5b8151610ea9848260208601610e1b565b91505092915050565b600080600060608486031215610ecb57610eca6106a5565b5b6000610ed986828701610d78565b9350506020610eea86828701610da4565b925050604084015167ffffffffffffffff811115610f0b57610f0a6106aa565b5b610f1786828701610e84565b9150509250925092565b6000604082019050610f366000830185610a3f565b610f436020830184610a3f565b9392505050565b600060208284031215610f6057610f5f6106a5565b5b6000610f6e84828501610d78565b9150509291505056fe608060405234801561001057600080fd5b506109af806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630a284cb614610030575b600080fd5b61004a600480360381019061004591906104c6565b61004c565b005b600080600061005d856000866100b0565b925092509250601660030b83146100a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100a09061057f565b60405180910390fd5b5050505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016100ee9392919061071b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101589190610795565b6000604051808303816000865af19150503d8060008114610195576040519150601f19603f3d011682016040523d82523d6000602084013e61019a565b606091505b5091509150816101f657601560008067ffffffffffffffff8111156101c2576101c16102b0565b5b6040519080825280602002602001820160405280156101f05781602001602082028036833780820191505090505b5061020b565b8080602001905181019061020a919061090a565b5b8260030b9250809550819650829750505050505093509350939050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102678261023c565b9050919050565b6102778161025c565b811461028257600080fd5b50565b6000813590506102948161026e565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6102e88261029f565b810181811067ffffffffffffffff82111715610307576103066102b0565b5b80604052505050565b600061031a610228565b905061032682826102df565b919050565b600067ffffffffffffffff821115610346576103456102b0565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff82111561037c5761037b6102b0565b5b6103858261029f565b9050602081019050919050565b82818337600083830152505050565b60006103b46103af84610361565b610310565b9050828152602081018484840111156103d0576103cf61035c565b5b6103db848285610392565b509392505050565b600082601f8301126103f8576103f761029a565b5b81356104088482602086016103a1565b91505092915050565b600061042461041f8461032b565b610310565b9050808382526020820190506020840283018581111561044757610446610357565b5b835b8181101561048e57803567ffffffffffffffff81111561046c5761046b61029a565b5b80860161047989826103e3565b85526020850194505050602081019050610449565b5050509392505050565b600082601f8301126104ad576104ac61029a565b5b81356104bd848260208601610411565b91505092915050565b600080604083850312156104dd576104dc610232565b5b60006104eb85828601610285565b925050602083013567ffffffffffffffff81111561050c5761050b610237565b5b61051885828601610498565b9150509250929050565b600082825260208201905092915050565b7f43616e2774206576656e21000000000000000000000000000000000000000000600082015250565b6000610569600b83610522565b915061057482610533565b602082019050919050565b600060208201905081810360008301526105988161055c565b9050919050565b6105a88161025c565b82525050565b600067ffffffffffffffff82169050919050565b6105cb816105ae565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561063757808201518184015260208101905061061c565b83811115610646576000848401525b50505050565b6000610657826105fd565b6106618185610608565b9350610671818560208601610619565b61067a8161029f565b840191505092915050565b6000610691838361064c565b905092915050565b6000602082019050919050565b60006106b1826105d1565b6106bb81856105dc565b9350836020820285016106cd856105ed565b8060005b8581101561070957848403895281516106ea8582610685565b94506106f583610699565b925060208a019950506001810190506106d1565b50829750879550505050505092915050565b6000606082019050610730600083018661059f565b61073d60208301856105c2565b818103604083015261074f81846106a6565b9050949350505050565b600081905092915050565b600061076f826105fd565b6107798185610759565b9350610789818560208601610619565b80840191505092915050565b60006107a18284610764565b915081905092915050565b60008160030b9050919050565b6107c2816107ac565b81146107cd57600080fd5b50565b6000815190506107df816107b9565b92915050565b6107ee816105ae565b81146107f957600080fd5b50565b60008151905061080b816107e5565b92915050565b600067ffffffffffffffff82111561082c5761082b6102b0565b5b602082029050602081019050919050565b6000819050919050565b6108508161083d565b811461085b57600080fd5b50565b60008151905061086d81610847565b92915050565b600061088661088184610811565b610310565b905080838252602082019050602084028301858111156108a9576108a8610357565b5b835b818110156108d257806108be888261085e565b8452602084019350506020810190506108ab565b5050509392505050565b600082601f8301126108f1576108f061029a565b5b8151610901848260208601610873565b91505092915050565b60008060006060848603121561092357610922610232565b5b6000610931868287016107d0565b9350506020610942868287016107fc565b925050604084015167ffffffffffffffff81111561096357610962610237565b5b61096f868287016108dc565b915050925092509256fea26469706673582212209c0bcbbf08bd476fd89ae39353b99b97bd4f2257ad164bca2738b015318c1d5664736f6c634300080c0033a2646970667358221220f2cc63a39a8b0f0d8ab1cb19a5c39d8ceff76e106abeb728e22b6796dc914a3d64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.json
deleted file mode 100644
index 8477a46e7a31..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.json
+++ /dev/null
@@ -1,64 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      }
-    ],
-    "name": "associateTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintNft",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token_type",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintNftViaDelegate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.bin
deleted file mode 100644
index 16e30dc88763..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610850806100206000396000f3fe6080604052600436106100345760003560e01c806338272d3914610039578063a150427514610055578063d46610c314610071575b600080fd5b610053600480360381019061004e919061031e565b61008d565b005b61006f600480360381019061006a919061031e565b610180565b005b61008b6004803603810190610086919061031e565b61025f565b005b600060ff60f81b3083604051806020016100a6906102cc565b6020820181038252601f19601f820116604052506040516020016100ca91906103c5565b604051602081830303815290604052805190602001206040516020016100f394939291906104c4565b6040516020818303038152906040528051906020012060001c9050600082606460405161011f906102cc565b82906040518091039083f59050905080158015610140573d6000803e3d6000fd5b5090508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161461017b57600080fd5b505050565b3073ffffffffffffffffffffffffffffffffffffffff1663d46610c36064836040518363ffffffff1660e01b81526004016101bb9190610521565b6000604051808303818588803b1580156101d457600080fd5b505af1935050505080156101e6575060015b610229576101f2610549565b806308c379a0141561021857506102076105dc565b80610212575061021a565b50610224565b505b3d6000803e3d6000fd5b61022a565b5b806064604051610239906102cc565b82906040518091039083f5905090508015801561025a573d6000803e3d6000fd5b505050565b80606460405161026e906102cc565b82906040518091039083f5905090508015801561028f573d6000803e3d6000fd5b50506040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102c3906106cf565b60405180910390fd5b61012b806106f083390190565b6000604051905090565b600080fd5b6000819050919050565b6102fb816102e8565b811461030657600080fd5b50565b600081359050610318816102f2565b92915050565b600060208284031215610334576103336102e3565b5b600061034284828501610309565b91505092915050565b600081519050919050565b600081905092915050565b60005b8381101561037f578082015181840152602081019050610364565b8381111561038e576000848401525b50505050565b600061039f8261034b565b6103a98185610356565b93506103b9818560208601610361565b80840191505092915050565b60006103d18284610394565b915081905092915050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b61042361041e826103dc565b610408565b82525050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061045482610429565b9050919050565b60008160601b9050919050565b60006104738261045b565b9050919050565b600061048582610468565b9050919050565b61049d61049882610449565b61047a565b82525050565b6000819050919050565b6104be6104b9826102e8565b6104a3565b82525050565b60006104d08287610412565b6001820191506104e0828661048c565b6014820191506104f082856104ad565b60208201915061050082846104ad565b60208201915081905095945050505050565b61051b816102e8565b82525050565b60006020820190506105366000830184610512565b92915050565b60008160e01c9050919050565b600060033d11156105685760046000803e61056560005161053c565b90505b90565b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6105b48261056b565b810181811067ffffffffffffffff821117156105d3576105d261057c565b5b80604052505050565b600060443d10156105ec5761066f565b6105f46102d9565b60043d036004823e80513d602482011167ffffffffffffffff8211171561061c57505061066f565b808201805167ffffffffffffffff81111561063a575050505061066f565b80602083010160043d03850181111561065757505050505061066f565b610666826020018501866105ab565b82955050505050505b90565b600082825260208201905092915050565b7f4e4f504500000000000000000000000000000000000000000000000000000000600082015250565b60006106b9600483610672565b91506106c482610683565b602082019050919050565b600060208201905081810360008301526106e8816106ac565b905091905056fe6080604052610118806100136000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063a89000c814602d575b600080fd5b60436004803603810190603f919060ba565b6045565b005b8073ffffffffffffffffffffffffffffffffffffffff16ff5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000608c826063565b9050919050565b609a816083565b811460a457600080fd5b50565b60008135905060b4816093565b92915050565b60006020828403121560cd5760cc605e565b5b600060d98482850160a7565b9150509291505056fea26469706673582212205074061022e0e66e74735e945f4855854d8990bab47fbfc62b8717f6c732431364736f6c634300080c0033a2646970667358221220efb038ea0c46c15ae0a298506bf82a49346aa2a4c5cbe6222b48e291b1d286ea64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.json
deleted file mode 100644
index f0ca83f78d4b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "buildDonor",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "buildThenRevert",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "buildThenRevertThenBuild",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.bin
deleted file mode 100644
index 515231484330..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610211806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063b624057b14610030575b600080fd5b61004a60048036038101906100459190610142565b610060565b604051610057919061017e565b60405180910390f35b6000808290508073ffffffffffffffffffffffffffffffffffffffff1663c6dad0826040518163ffffffff1660e01b81526004016020604051808303816000875af11580156100b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d791906101ae565b915050919050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061010f826100e4565b9050919050565b61011f81610104565b811461012a57600080fd5b50565b60008135905061013c81610116565b92915050565b600060208284031215610158576101576100df565b5b60006101668482850161012d565b91505092915050565b61017881610104565b82525050565b6000602082019050610193600083018461016f565b92915050565b6000815190506101a881610116565b92915050565b6000602082840312156101c4576101c36100df565b5b60006101d284828501610199565b9150509291505056fea264697066735822122010ac0a38db3d659b9742d9dbf88888a6c47ee533bd1754facc5ff2bb444b7f1464736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.json
deleted file mode 100644
index c42a93398973..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "makerAddress",
-        "type": "address"
-      }
-    ],
-    "name": "makeOpaquely",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.bin
deleted file mode 100644
index 12873022c2fc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061034a806100206000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632f19c04a1461005c57806338cc483114610087578063efc81a8c146100de575b600080fd5b34801561006857600080fd5b506100716100f5565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b5061009c6101bc565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156100ea57600080fd5b506100f36101e5565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663086949b76040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561017c57600080fd5b505af1158015610190573d6000803e3d6000fd5b505050506040513d60208110156101a657600080fd5b8101908080519060200190929190505050905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b6101ed61024b565b604051809103906000f080158015610209573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60405160c48061025b83390190560060806040526008600055348015601457600080fd5b5060a1806100236000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063086949b7146044575b600080fd5b348015604f57600080fd5b506056606c565b6040518082815260200191505060405180910390f35b600060079050905600a165627a7a723058202e097bbe122ad5d86e840be60aab41d160ad5b86745aa7aa0099a6bbfc2652180029a165627a7a723058206cf7ea9d4e506886b602ff7a628401611437cbfd0dfcbd5beec37757070da5b30029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.json
deleted file mode 100644
index a7eecc883c12..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "create",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getAddress",
-    "outputs": [
-      {
-        "internalType": "contract Trivial",
-        "name": "retval",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getIndirect",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.bin
deleted file mode 100644
index bc06be49719f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060008060405180602001610024906100b7565b6020820181038252601f19601f820116604052509050600060405160200161004b906100e7565b604051602081830303815290604052805190602001209050808251602084016000f59250826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050610130565b61025e806103d383390190565b60006100d16006836100fc565b91506100dc82610107565b600682019050919050565b60006100f2826100c4565b9150819050919050565b600081905092915050565b7f7065726d69740000000000000000000000000000000000000000000000000000600082015250565b6102948061013f6000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633af32abf14610030575b600080fd5b61004a6004803603810190610045919061013f565b610060565b60405161005791906101d2565b60405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16633af32abf836040518263ffffffff1660e01b81526004016100bc91906101b7565b602060405180830381600087803b1580156100d657600080fd5b505af11580156100ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010e919061016c565b9050919050565b60008135905061012481610230565b92915050565b60008151905061013981610247565b92915050565b6000602082840312156101555761015461022b565b5b600061016384828501610115565b91505092915050565b6000602082840312156101825761018161022b565b5b60006101908482850161012a565b91505092915050565b6101a2816101ed565b82525050565b6101b1816101ff565b82525050565b60006020820190506101cc6000830184610199565b92915050565b60006020820190506101e760008301846101a8565b92915050565b60006101f88261020b565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600080fd5b610239816101ed565b811461024457600080fd5b50565b610250816101ff565b811461025b57600080fd5b5056fea26469706673582212201c62aebe3c9d59535f631b71d926edfac67c5bb717d8276cc7233a04860726c664736f6c63430008070033608060405234801561001057600080fd5b5061023e806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633af32abf14610030575b600080fd5b61004a60048036038101906100459190610113565b610060565b604051610057919061017c565b60405180910390f35b60008173ffffffffffffffffffffffffffffffffffffffff16630ad8f4a16040518163ffffffff1660e01b8152600401602060405180830381600087803b1580156100aa57600080fd5b505af11580156100be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100e29190610140565b9050919050565b6000813590506100f8816101da565b92915050565b60008151905061010d816101f1565b92915050565b600060208284031215610129576101286101d5565b5b6000610137848285016100e9565b91505092915050565b600060208284031215610156576101556101d5565b5b6000610164848285016100fe565b91505092915050565b610176816101a9565b82525050565b6000602082019050610191600083018461016d565b92915050565b60006101a2826101b5565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600080fd5b6101e381610197565b81146101ee57600080fd5b50565b6101fa816101a9565b811461020557600080fd5b5056fea2646970667358221220e4645853a4208e153d1bb81ab56fbd5cc6c99f5ccf081f99ac4af708fcb5a8e664736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.json
deleted file mode 100644
index 219d894ceace..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "whitelister",
-        "type": "address"
-      }
-    ],
-    "name": "isWhitelisted",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.bin
deleted file mode 100644
index a3b0ea7807c7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526000600260146101000a81548160ff0219169083151502179055506101c060405190810160405280603c63ffffffff1663ffffffff168152602001607863ffffffff1663ffffffff16815260200161012c63ffffffff1663ffffffff16815260200161025863ffffffff1663ffffffff16815260200161070863ffffffff1663ffffffff168152602001610e1063ffffffff1663ffffffff168152602001611c2063ffffffff1663ffffffff16815260200161384063ffffffff1663ffffffff16815260200161708063ffffffff1663ffffffff16815260200161e10063ffffffff1663ffffffff1681526020016201518063ffffffff1663ffffffff1681526020016202a30063ffffffff1663ffffffff1681526020016205460063ffffffff1663ffffffff16815260200162093a8063ffffffff1663ffffffff16815250600390600e62000156929190620007a2565b50600f60055566071afd498d0000600e553480156200017457600080fd5b506001600260146101000a81548160ff021916908315150217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555033600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506200025260008060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600062000259640100000000026401000000009004565b50620008f6565b600080620002666200084c565b60008863ffffffff16891415156200027d57600080fd5b8763ffffffff16881415156200029257600080fd5b8661ffff1687141515620002a557600080fd5b600287811515620002b257fe5b049250600d8361ffff161115620002c857600d92505b610100604051908101604052808781526020014267ffffffffffffffff168152602001600067ffffffffffffffff1681526020018a63ffffffff1681526020018963ffffffff168152602001600063ffffffff1681526020018461ffff1681526020018861ffff1681525091506001600683908060018154018082558091505090600182039060005260206000209060020201600090919290919091506000820151816000015560208201518160010160006101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555060408201518160010160086101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555060608201518160010160106101000a81548163ffffffff021916908363ffffffff16021790555060808201518160010160146101000a81548163ffffffff021916908363ffffffff16021790555060a08201518160010160186101000a81548163ffffffff021916908363ffffffff16021790555060c082015181600101601c6101000a81548161ffff021916908361ffff16021790555060e082015181600101601e6101000a81548161ffff021916908361ffff16021790555050500390508063ffffffff1681141515620004a257600080fd5b7f0a5311bd2a6608f08a180df2ee7c5946819a649b204b554bb8e39825b2c50ad58582846060015163ffffffff16856080015163ffffffff168660000151604051808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018581526020018481526020018381526020018281526020019550505050505060405180910390a16200055a6000868362000569640100000000026401000000009004565b80935050505095945050505050565b600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008154809291906001019190505550816007600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141515620006fe57600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000815480929190600190039190505550600a600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556009600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555b7fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef838383604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a1505050565b82600e600701600890048101928215620008395791602002820160005b838211156200080557835183826101000a81548163ffffffff021916908363ffffffff1602179055509260200192600401602081600301049283019260010302620007bf565b8015620008375782816101000a81549063ffffffff021916905560040160208160030104928301926001030262000805565b505b509050620008489190620008c0565b5090565b6101006040519081016040528060008152602001600067ffffffffffffffff168152602001600067ffffffffffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600061ffff168152602001600061ffff1681525090565b620008f391905b80821115620008ef57600081816101000a81549063ffffffff021916905550600101620008c7565b5090565b90565b616e0380620009066000396000f30060806040526004361061034e576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806301ffc9a7146104045780630519ce79146104685780630560ff44146104bf57806305e455461461057d57806306fdde03146105a8578063095ea7b3146106385780630a0f8168146106855780630e583df0146106dc57806314001f4c1461070757806318160ddd1461074a578063183a7947146107755780631940a936146107a057806319c2f201146107e557806321717ebf1461081057806323b872dd1461086757806324e7a38a146108d457806327d7874c146109175780632ba73c151461095a57806332bb88551461099d578063371ec30314610a255780633d7d3f5a14610aad5780633f4ba83a14610af8578063438f5fc514610b0f57806346116e6f14610b9757806346d22c7014610c04578063481af3d314610c535780634ad8c93814610cc05780634b85fd5514610d0b5780634dfff04f14610d385780634e0a337914610d855780635612913414610dc85780635663896e14610e1557806357e3bc9314610e425780635c975abb14610eca5780635fd8c71014610ef95780636352211e14610f10578063680eba2714610f7d5780636af04a5714610fa85780636c17f40514610fff5780636fbde40d1461108757806370a08231146110ca57806371587988146111215780637a7d493714611164578063803e75e61461118f5780638456cb59146112175780638462151c1461122e578063870d0925146112c657806388c2a0bf1461134e57806391876e571461138f57806395d89b41146113a65780639d6fac6f14611436578063a45f4bfc14611483578063a9059cbb146114f0578063b047fb501461153d578063b0c35c0514611594578063b0df6ecf146115bf578063b104862314611647578063bc4006f5146116cf578063c3bea9af14611726578063d105080a14611753578063d2e7a10b146117db578063d3e6f49f14611863578063defb9584146118a8578063e17b25af146118d3578063e6cbe35114611916578063e92f8ba91461196d578063e98b7f4d146119f5578063ed60ade614611a7d578063edea744a14611aa7578063f1ca941014611b2f578063f2b47d5214611b5a578063f7d8c88314611bb1575b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806103f75750600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561040257600080fd5b005b34801561041057600080fd5b5061044e60048036038101908080357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19169060200190929190505050611bdb565b604051808215151515815260200191505060405180910390f35b34801561047457600080fd5b5061047d611eec565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156104cb57600080fd5b5061050260048036038101908080359060200190929190803590602001908201803590602001919091929391929390505050611f12565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610542578082015181840152602081019050610527565b50505050905090810190601f16801561056f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561058957600080fd5b5061059261209b565b6040518082815260200191505060405180910390f35b3480156105b457600080fd5b506105bd6120a1565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156105fd5780820151818401526020810190506105e2565b50505050905090810190601f16801561062a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561064457600080fd5b50610683600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506120da565b005b34801561069157600080fd5b5061069a6121b8565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156106e857600080fd5b506106f16121dd565b6040518082815260200191505060405180910390f35b34801561071357600080fd5b50610748600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506121e8565b005b34801561075657600080fd5b5061075f612337565b6040518082815260200191505060405180910390f35b34801561078157600080fd5b5061078a612347565b6040518082815260200191505060405180910390f35b3480156107ac57600080fd5b506107cb6004803603810190808035906020019092919050505061234d565b604051808215151515815260200191505060405180910390f35b3480156107f157600080fd5b506107fa61239f565b6040518082815260200191505060405180910390f35b34801561081c57600080fd5b506108256123a6565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561087357600080fd5b506108d2600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506123cc565b005b3480156108e057600080fd5b50610915600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050612499565b005b34801561092357600080fd5b50610958600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506125e8565b005b34801561096657600080fd5b5061099b600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506126c2565b005b3480156109a957600080fd5b506109c86004803603810190808035906020019092919050505061279d565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015610a3157600080fd5b50610a50600480360381019080803590602001909291905050506128fe565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015610ab957600080fd5b50610af660048036038101908080359060200190929190803590602001909291908035906020019092919080359060200190929190505050612a5f565b005b348015610b0457600080fd5b50610b0d612bcc565b005b348015610b1b57600080fd5b50610b3a60048036038101908080359060200190929190505050612dc3565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015610ba357600080fd5b50610bc260048036038101908080359060200190929190505050612f24565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b348015610c1057600080fd5b50610c396004803603810190808035906020019092919080359060200190929190505050612f57565b604051808215151515815260200191505060405180910390f35b348015610c5f57600080fd5b50610c7e60048036038101908080359060200190929190505050612fdf565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b348015610ccc57600080fd5b50610d0960048036038101908080359060200190929190803590602001909291908035906020019092919080359060200190929190505050613012565b005b348015610d1757600080fd5b50610d366004803603810190808035906020019092919050505061317e565b005b348015610d4457600080fd5b50610d83600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506131e4565b005b348015610d9157600080fd5b50610dc6600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061326b565b005b348015610dd457600080fd5b50610e1360048036038101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050613346565b005b348015610e2157600080fd5b50610e406004803603810190808035906020019092919050505061343b565b005b348015610e4e57600080fd5b50610e6d6004803603810190808035906020019092919050505061358f565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015610ed657600080fd5b50610edf6136f0565b604051808215151515815260200191505060405180910390f35b348015610f0557600080fd5b50610f0e613703565b005b348015610f1c57600080fd5b50610f3b600480360381019080803590602001909291905050506137ef565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b348015610f8957600080fd5b50610f92613868565b6040518082815260200191505060405180910390f35b348015610fb457600080fd5b50610fbd61386e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561100b57600080fd5b5061102a60048036038101908080359060200190929190505050613894565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b34801561109357600080fd5b506110c8600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506139f5565b005b3480156110d657600080fd5b5061110b600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050613b44565b6040518082815260200191505060405180910390f35b34801561112d57600080fd5b50611162600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050613b8d565b005b34801561117057600080fd5b50611179613caa565b6040518082815260200191505060405180910390f35b34801561119b57600080fd5b506111ba60048036038101908080359060200190929190505050613cb0565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b34801561122357600080fd5b5061122c613e11565b005b34801561123a57600080fd5b5061126f600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050613f55565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156112b2578082015181840152602081019050611297565b505050509050019250505060405180910390f35b3480156112d257600080fd5b506112f1600480360381019080803590602001909291905050506140a2565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b34801561135a57600080fd5b5061137960048036038101908080359060200190929190505050614203565b6040518082815260200191505060405180910390f35b34801561139b57600080fd5b506113a461463a565b005b3480156113b257600080fd5b506113bb614883565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156113fb5780820151818401526020810190506113e0565b50505050905090810190601f1680156114285780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561144257600080fd5b50611461600480360381019080803590602001909291905050506148bc565b604051808263ffffffff1663ffffffff16815260200191505060405180910390f35b34801561148f57600080fd5b506114ae600480360381019080803590602001909291905050506148eb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156114fc57600080fd5b5061153b600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061491e565b005b34801561154957600080fd5b50611552614a8f565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b3480156115a057600080fd5b506115a9614ab5565b6040518082815260200191505060405180910390f35b3480156115cb57600080fd5b506115ea60048036038101908080359060200190929190505050614abb565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b34801561165357600080fd5b5061167260048036038101908080359060200190929190505050614c1c565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b3480156116db57600080fd5b506116e4614d7d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561173257600080fd5b5061175160048036038101908080359060200190929190505050614da3565b005b34801561175f57600080fd5b5061177e60048036038101908080359060200190929190505050614f66565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b3480156117e757600080fd5b50611806600480360381019080803590602001909291905050506150c7565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b34801561186f57600080fd5b5061188e60048036038101908080359060200190929190505050615228565b604051808215151515815260200191505060405180910390f35b3480156118b457600080fd5b506118bd615397565b6040518082815260200191505060405180910390f35b3480156118df57600080fd5b50611914600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061539d565b005b34801561192257600080fd5b5061192b61543c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561197957600080fd5b5061199860048036038101908080359060200190929190505050615462565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015611a0157600080fd5b50611a20600480360381019080803590602001909291905050506155c3565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b611aa56004803603810190808035906020019092919080359060200190929190505050615724565b005b348015611ab357600080fd5b50611ad26004803603810190808035906020019092919050505061592a565b604051808b1515151581526020018a1515151581526020018981526020018881526020018781526020018681526020018581526020018481526020018381526020018281526020019a505050505050505050505060405180910390f35b348015611b3b57600080fd5b50611b44615a8b565b6040518082815260200191505060405180910390f35b348015611b6657600080fd5b50611b6f615a91565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b611bd96004803603810190808035906020019092919080359060200190929190505050615ab7565b005b600060405180807f737570706f727473496e74657266616365286279746573342900000000000000815250601901905060405180910390207bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161480611ee5575060405180807f746f6b656e4d657461646174612875696e743235362c737472696e6729000000815250601d019050604051809103902060405180807f746f6b656e734f664f776e6572286164647265737329000000000000000000008152506016019050604051809103902060405180807f7472616e7366657246726f6d28616464726573732c616464726573732c75696e81526020017f74323536290000000000000000000000000000000000000000000000000000008152506025019050604051809103902060405180807f7472616e7366657228616464726573732c75696e7432353629000000000000008152506019019050604051809103902060405180807f617070726f766528616464726573732c75696e743235362900000000000000008152506018019050604051809103902060405180807f6f776e65724f662875696e7432353629000000000000000000000000000000008152506010019050604051809103902060405180807f62616c616e63654f6628616464726573732900000000000000000000000000008152506012019050604051809103902060405180807f746f74616c537570706c79282900000000000000000000000000000000000000815250600d019050604051809103902060405180807f73796d626f6c28290000000000000000000000000000000000000000000000008152506008019050604051809103902060405180807f6e616d6528290000000000000000000000000000000000000000000000000000815250600601905060405180910390201818181818181818187bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916145b9050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6060611f1c616d40565b60008073ffffffffffffffffffffffffffffffffffffffff16600d60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515611f7b57600080fd5b600d60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663cb4799f28787876040518463ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180848152602001806020018281038252848482818152602001925080828437820191505094505050505060a060405180830381600087803b15801561202e57600080fd5b505af1158015612042573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525060a081101561206757600080fd5b810190809190826080018051906020019092919050505080925081935050506120908282615df8565b925050509392505050565b60115481565b6040805190810160405280600d81526020017f43727970746f4b6974746965730000000000000000000000000000000000000081525081565b600260149054906101000a900460ff161515156120f657600080fd5b6121003382615e54565b151561210b57600080fd5b6121158183615ec0565b7f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925338383604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a15050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b662386f26fc1000081565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561224557600080fd5b8190508073ffffffffffffffffffffffffffffffffffffffff166376190f8f6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1580156122ac57600080fd5b505af11580156122c0573d6000803e3d6000fd5b505050506040513d60208110156122d657600080fd5b810190808051906020019092919050505015156122f257600080fd5b80600c60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b6000600160068054905003905090565b600f5481565b6000808211151561235d57600080fd5b600060068381548110151561236e57fe5b906000526020600020906002020160010160189054906101000a900463ffffffff1663ffffffff1614159050919050565b6201518081565b600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260149054906101000a900460ff161515156123e857600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415151561242457600080fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415151561245f57600080fd5b6124693382615f16565b151561247457600080fd5b61247e8382615e54565b151561248957600080fd5b612494838383615f82565b505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156124f657600080fd5b8190508073ffffffffffffffffffffffffffffffffffffffff166354c15b826040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561255d57600080fd5b505af1158015612571573d6000803e3d6000fd5b505050506040513d602081101561258757600080fd5b810190808051906020019092919050505015156125a357600080fd5b80601060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561264357600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561267f57600080fd5b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561271d57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561275957600080fd5b80600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600080600080600080600080600080600060068c8154811015156127bd57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600080600080600080600080600080600060068c81548110151561291e57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600260149054906101000a900460ff16151515612a7b57600080fd5b612a853385615e54565b1515612a9057600080fd5b612a998461234d565b151515612aa557600080fd5b612ad184600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16615ec0565b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166327ebe40a85858585336040518663ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808681526020018581526020018481526020018381526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200195505050505050600060405180830381600087803b158015612bae57600080fd5b505af1158015612bc2573d6000803e3d6000fd5b5050505050505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515612c2757600080fd5b600260149054906101000a900460ff161515612c4257600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515612ca057600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515612cfe57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16601060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151515612d5c57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515612db957600080fd5b612dc16161ba565b565b600080600080600080600080600080600060068c815481101515612de357fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600a6020528060005260406000206000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008085111515612f6a57600080fd5b600084111515612f7957600080fd5b600685815481101515612f8857fe5b90600052602060002090600202019150600684815481101515612fa757fe5b90600052602060002090600202019050612fc38286838761624d565b8015612fd55750612fd48486616462565b5b9250505092915050565b60096020528060005260406000206000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260149054906101000a900460ff1615151561302e57600080fd5b6130383385615e54565b151561304357600080fd5b61304c84615228565b151561305757600080fd5b61308384600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16615ec0565b600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166327ebe40a85858585336040518663ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808681526020018581526020018481526020018381526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200195505050505050600060405180830381600087803b15801561316057600080fd5b505af1158015613174573d6000803e3d6000fd5b5050505050505050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156131da57600080fd5b80600e8190555050565b600260149054906101000a900460ff1615151561320057600080fd5b61320a3382615e54565b151561321557600080fd5b81600a600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156132c657600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561330257600080fd5b80600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156133a457600080fd5b819050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141561340257600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b61138860115410151561341457600080fd5b60116000815480929190600101919050555061343560008060008685616575565b50505050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806134e357506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b8061353b5750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561354657600080fd5b60036000600e8110151561355657fe5b600891828204019190066004029054906101000a900463ffffffff1663ffffffff168110151561358557600080fd5b8060058190555050565b600080600080600080600080600080600060068c8154811015156135af57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600260149054906101000a900460ff1681565b600080600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561376257600080fd5b3073ffffffffffffffffffffffffffffffffffffffff16319150600e546001600f5401029050808211156137eb57600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc8284039081150290604051600060405180830381858888f19350505050505b5050565b60006007600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561386357600080fd5b919050565b61afc881565b601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600080600080600080600080600060068c8154811015156138b457fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515613a5257600080fd5b8190508073ffffffffffffffffffffffffffffffffffffffff166385b861886040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b158015613ab957600080fd5b505af1158015613acd573d6000803e3d6000fd5b505050506040513d6020811015613ae357600080fd5b81019080805190602001909291905050501515613aff57600080fd5b80600b60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b6000600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515613be857600080fd5b600260149054906101000a900460ff161515613c0357600080fd5b80601360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f450db8da6efbe9c22f2347f7c2021231df1fc58d3ae9a2fa75d39fa44619930581604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b60055481565b600080600080600080600080600080600060068c815481101515613cd057fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161480613eb957506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b80613f115750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b1515613f1c57600080fd5b600260149054906101000a900460ff16151515613f3857600080fd5b6001600260146101000a81548160ff021916908315150217905550565b6060600060606000806000613f6987613b44565b94506000851415613fac576000604051908082528060200260200182016040528015613fa45781602001602082028038833980820191505090505b509550614098565b84604051908082528060200260200182016040528015613fdb5781602001602082028038833980820191505090505b509350613fe6612337565b925060009150600190505b8281111515614094578673ffffffffffffffffffffffffffffffffffffffff166007600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156140875780848381518110151561407057fe5b906020019060200201818152505081806001019250505b8080600101915050613ff1565b8395505b5050505050919050565b600080600080600080600080600080600060068c8154811015156140c257fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600080600080600080600080600260149054906101000a900460ff1615151561422b57600080fd5b60068981548110151561423a57fe5b9060005260206000209060020201965060008760010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff161415151561427c57600080fd5b6143b2876101006040519081016040529081600082015481526020016001820160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160109054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160149054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160189054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160018201601c9054906101000a900461ffff1661ffff1661ffff16815260200160018201601e9054906101000a900461ffff1661ffff1661ffff168152505061686c565b15156143bd57600080fd5b8660010160189054906101000a900463ffffffff1663ffffffff1695506006868154811015156143e957fe5b9060005260206000209060020201945086600101601e9054906101000a900461ffff16935086600101601e9054906101000a900461ffff1661ffff1685600101601e9054906101000a900461ffff1661ffff1611156144585784600101601e9054906101000a900461ffff1693505b601060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630d9f5aed8860000154876000015460018b60010160089054906101000a900467ffffffffffffffff16036040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808481526020018381526020018267ffffffffffffffff1681526020019350505050602060405180830381600087803b15801561452657600080fd5b505af115801561453a573d6000803e3d6000fd5b505050506040513d602081101561455057600080fd5b81019080805190602001909291905050509250600760008a815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1691506145c7898860010160189054906101000a900463ffffffff1663ffffffff166001870161ffff168686616575565b90508660010160186101000a81549063ffffffff0219169055600f60008154809291906001900391905055503373ffffffffffffffffffffffffffffffffffffffff166108fc600e549081150290604051600060405180830381858888f193505050505080975050505050505050919050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806146e257506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b8061473a5750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b151561474557600080fd5b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16635fd8c7106040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401600060405180830381600087803b1580156147cb57600080fd5b505af11580156147df573d6000803e3d6000fd5b50505050600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16635fd8c7106040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401600060405180830381600087803b15801561486957600080fd5b505af115801561487d573d6000803e3d6000fd5b50505050565b6040805190810160405280600281526020017f434b00000000000000000000000000000000000000000000000000000000000081525081565b600381600e811015156148cb57fe5b60089182820401919006600402915054906101000a900463ffffffff1681565b60076020528060005260406000206000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260149054906101000a900460ff1615151561493a57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415151561497657600080fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141515156149b157600080fd5b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614151515614a0e57600080fd5b600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614151515614a6b57600080fd5b614a753382615e54565b1515614a8057600080fd5b614a8b338383615f82565b5050565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600e5481565b600080600080600080600080600080600060068c815481101515614adb57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600080600080600080600080600080600060068c815481101515614c3c57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600d60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515614e0157600080fd5b61afc8601254101515614e1357600080fd5b614e2260008060008530616575565b9050614e5081600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16615ec0565b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166327ebe40a82614e976168a7565b600062015180306040518663ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808681526020018581526020018481526020018381526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200195505050505050600060405180830381600087803b158015614f3857600080fd5b505af1158015614f4c573d6000803e3d6000fd5b505050506012600081548092919060010191905055505050565b600080600080600080600080600080600060068c815481101515614f8657fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600080600080600080600080600080600060068c8154811015156150e757fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b60008060008311151561523a57600080fd5b60068381548110151561524957fe5b9060005260206000209060020201905061538f816101006040519081016040529081600082015481526020016001820160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160109054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160149054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160189054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160018201601c9054906101000a900461ffff1661ffff1661ffff16815260200160018201601e9054906101000a900461ffff1661ffff1661ffff16815250506169c2565b915050919050565b61138881565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156153f857600080fd5b80600d60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600080600080600080600080600060068c81548110151561548257fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b600080600080600080600080600080600060068c8154811015156155e357fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b6000600260149054906101000a900460ff1615151561574257600080fd5b61574c3383615e54565b151561575757600080fd5b61576082615228565b151561576b57600080fd5b61577582846169fc565b151561578057600080fd5b600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663c55d0f56846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050602060405180830381600087803b15801561581157600080fd5b505af1158015615825573d6000803e3d6000fd5b505050506040513d602081101561583b57600080fd5b81019080805190602001909291905050509050600e548101341015151561586157600080fd5b600c60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663454a2ab3600e543403856040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808281526020019150506000604051808303818588803b1580156158f657600080fd5b505af115801561590a573d6000803e3d6000fd5b50505050506159258263ffffffff168463ffffffff16616a55565b505050565b600080600080600080600080600080600060068c81548110151561594a57fe5b9060005260206000209060020201905060008160010160189054906101000a900463ffffffff1663ffffffff1614159a50438160010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff161115995080600101601c9054906101000a900461ffff1661ffff1698508060010160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1697508060010160189054906101000a900463ffffffff1663ffffffff1696508060010160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1695508060010160109054906101000a900463ffffffff1663ffffffff1694508060010160149054906101000a900463ffffffff1663ffffffff16935080600101601e9054906101000a900461ffff1661ffff16925080600001549150509193959799509193959799565b60125481565b601060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600260149054906101000a900460ff16151515615ad657600080fd5b600e543410151515615ae757600080fd5b615af13385615e54565b1515615afc57600080fd5b615b068385616462565b1515615b1157600080fd5b600684815481101515615b2057fe5b90600052602060002090600202019150615c66826101006040519081016040529081600082015481526020016001820160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160109054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160149054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160189054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160018201601c9054906101000a900461ffff1661ffff1661ffff16815260200160018201601e9054906101000a900461ffff1661ffff1661ffff16815250506169c2565b1515615c7157600080fd5b600683815481101515615c8057fe5b90600052602060002090600202019050615dc6816101006040519081016040529081600082015481526020016001820160009054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160089054906101000a900467ffffffffffffffff1667ffffffffffffffff1667ffffffffffffffff1681526020016001820160109054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160149054906101000a900463ffffffff1663ffffffff1663ffffffff1681526020016001820160189054906101000a900463ffffffff1663ffffffff1663ffffffff16815260200160018201601c9054906101000a900461ffff1661ffff1661ffff16815260200160018201601e9054906101000a900461ffff1661ffff1661ffff16815250506169c2565b1515615dd157600080fd5b615ddd8285838661624d565b1515615de857600080fd5b615df28484616a55565b50505050565b606080600080846040519080825280601f01601f191660200182016040528015615e315781602001602082028038833980820191505090505b509250602083019150859050615e48828287616c1f565b82935050505092915050565b60008273ffffffffffffffffffffffffffffffffffffffff166007600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614905092915050565b806009600084815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b60008273ffffffffffffffffffffffffffffffffffffffff166009600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614905092915050565b600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008154809291906001019190505550816007600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614151561611657600860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000815480929190600190039190505550600a600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556009600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555b7fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef838383604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a1505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561621557600080fd5b600260149054906101000a900460ff16151561623057600080fd5b6000600260146101000a81548160ff021916908315150217905550565b600081841415616260576000905061645a565b818560010160109054906101000a900463ffffffff1663ffffffff1614806162a15750818560010160149054906101000a900463ffffffff1663ffffffff16145b156162af576000905061645a565b838360010160109054906101000a900463ffffffff1663ffffffff1614806162f05750838360010160149054906101000a900463ffffffff1663ffffffff16145b156162fe576000905061645a565b60008360010160109054906101000a900463ffffffff1663ffffffff161480616341575060008560010160109054906101000a900463ffffffff1663ffffffff16145b1561634f576001905061645a565b8460010160109054906101000a900463ffffffff1663ffffffff168360010160109054906101000a900463ffffffff1663ffffffff1614806163c457508460010160149054906101000a900463ffffffff1663ffffffff168360010160109054906101000a900463ffffffff1663ffffffff16145b156163d2576000905061645a565b8460010160109054906101000a900463ffffffff1663ffffffff168360010160149054906101000a900463ffffffff1663ffffffff16148061644757508460010160149054906101000a900463ffffffff1663ffffffff168360010160149054906101000a900463ffffffff1663ffffffff16145b15616455576000905061645a565b600190505b949350505050565b60008060006007600085815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1691506007600086815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16148061656b57508173ffffffffffffffffffffffffffffffffffffffff16600a600087815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16145b9250505092915050565b600080616580616d63565b60008863ffffffff168914151561659657600080fd5b8763ffffffff16881415156165aa57600080fd5b8661ffff16871415156165bc57600080fd5b6002878115156165c857fe5b049250600d8361ffff1611156165dd57600d92505b610100604051908101604052808781526020014267ffffffffffffffff168152602001600067ffffffffffffffff1681526020018a63ffffffff1681526020018963ffffffff168152602001600063ffffffff1681526020018461ffff1681526020018861ffff1681525091506001600683908060018154018082558091505090600182039060005260206000209060020201600090919290919091506000820151816000015560208201518160010160006101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555060408201518160010160086101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555060608201518160010160106101000a81548163ffffffff021916908363ffffffff16021790555060808201518160010160146101000a81548163ffffffff021916908363ffffffff16021790555060a08201518160010160186101000a81548163ffffffff021916908363ffffffff16021790555060c082015181600101601c6101000a81548161ffff021916908361ffff16021790555060e082015181600101601e6101000a81548161ffff021916908361ffff16021790555050500390508063ffffffff16811415156167b657600080fd5b7f0a5311bd2a6608f08a180df2ee7c5946819a649b204b554bb8e39825b2c50ad58582846060015163ffffffff16856080015163ffffffff168660000151604051808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018581526020018481526020018381526020018281526020019550505050505060405180910390a161685d60008683615f82565b80935050505095945050505050565b6000808260a0015163ffffffff16141580156168a057504367ffffffffffffffff16826040015167ffffffffffffffff1611155b9050919050565b6000806000600b60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663eac9d94c6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15801561693257600080fd5b505af1158015616946573d6000803e3d6000fd5b505050506040513d602081101561695c57600080fd5b81019080805190602001909291905050509150816fffffffffffffffffffffffffffffffff168214151561698f57600080fd5b60028281151561699b57fe5b0482019050662386f26fc100008110156169ba57662386f26fc1000090505b809250505090565b6000808260a0015163ffffffff161480156169f557504367ffffffffffffffff16826040015167ffffffffffffffff1611155b9050919050565b6000806000600685815481101515616a1057fe5b90600052602060002090600202019150600684815481101515616a2f57fe5b90600052602060002090600202019050616a4b8286838761624d565b9250505092915050565b600080600683815481101515616a6757fe5b90600052602060002090600202019150600684815481101515616a8657fe5b90600052602060002090600202019050828160010160186101000a81548163ffffffff021916908363ffffffff160217905550616ac282616c6a565b616acb81616c6a565b600a600085815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600a600084815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055600f600081548092919060010191905055507f241ea03ca20251805084d27d4440371c34a0b85ff108f6bb5611248f73818b806007600086815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1685858460010160089054906101000a900467ffffffffffffffff16604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018481526020018381526020018267ffffffffffffffff16815260200194505050505060405180910390a150505050565b60005b602082101515616c475782518452602084019350602083019250602082039150616c22565b6001826020036101000a0390508019835116818551168181178652505050505050565b43600554600383600101601c9054906101000a900461ffff1661ffff16600e81101515616c9357fe5b600891828204019190066004029054906101000a900463ffffffff1663ffffffff16811515616cbe57fe5b04018160010160086101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905550600d81600101601c9054906101000a900461ffff1661ffff161015616d3d57600181600101601c8282829054906101000a900461ffff160192506101000a81548161ffff021916908361ffff1602179055505b50565b608060405190810160405280600490602082028038833980820191505090505090565b6101006040519081016040528060008152602001600067ffffffffffffffff168152602001600067ffffffffffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600061ffff168152602001600061ffff16815250905600a165627a7a72305820f55363ab64d718a3d068a27f725a7eed3c7db72ff266b8b20ca9dfd044420c970029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.bin
deleted file mode 100644
index 6ebee80c5a26..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405261111f806100115f395ff3fe608060405260043610610054575f3560e01c80630ed0727614610058578063636e082b1461008057806374be48061461009c5780637c41ad2c146100b8578063830c29ae146100f4578063f5daadc214610110575b5f80fd5b348015610063575f80fd5b5061007e60048036038101906100799190610a43565b610138565b005b61009a60048036038101906100959190610ac5565b61018e565b005b6100b660048036038101906100b19190610ac5565b6101d5565b005b3480156100c3575f80fd5b506100de60048036038101906100d99190610af0565b610250565b6040516100eb9190610b33565b60405180910390f35b61010e60048036038101906101099190610ac5565b61035f565b005b34801561011b575f80fd5b5061013660048036038101906101319190610b7f565b61040e565b005b5f61014282610456565b9050601660030b811461018a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161018190610c17565b60405180910390fd5b5050565b8073ffffffffffffffffffffffffffffffffffffffff166108fc3490811502906040515f60405180830381858888f193505050501580156101d1573d5f803e3d5ffd5b5050565b5f8173ffffffffffffffffffffffffffffffffffffffff166108fc3490811502906040515f60405180830381858888f1935050505090508061024c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161024390610c7f565b60405180910390fd5b5050565b5f805f61016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016102859190610cac565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102ef9190610d31565b5f604051808303815f865af19150503d805f8114610328576040519150601f19603f3d011682016040523d82523d5f602084013e61032d565b606091505b50915091508161033e576015610353565b808060200190518101906103529190610d7d565b5b60030b92505050919050565b5f808273ffffffffffffffffffffffffffffffffffffffff163460405161038590610dcb565b5f6040518083038185875af1925050503d805f81146103bf576040519150601f19603f3d011682016040523d82523d5f602084013e6103c4565b606091505b509150915081610409576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161040090610c7f565b60405180910390fd5b505050565b8173ffffffffffffffffffffffffffffffffffffffff166108fc8290811502906040515f60405180830381858888f19350505050158015610451573d5f803e3d5ffd5b505050565b5f805f61016773ffffffffffffffffffffffffffffffffffffffff1663189a554c60e01b8560405160240161048b91906110c9565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104f59190610d31565b5f604051808303815f865af19150503d805f811461052e576040519150601f19603f3d011682016040523d82523d5f602084013e610533565b606091505b509150915081610544576015610559565b808060200190518101906105589190610d7d565b5b60030b92505050919050565b5f604051905090565b5f80fd5b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b6105c08261057a565b810181811067ffffffffffffffff821117156105df576105de61058a565b5b80604052505050565b5f6105f1610565565b90506105fd82826105b7565b919050565b5f67ffffffffffffffff82111561061c5761061b61058a565b5b602082029050602081019050919050565b5f80fd5b5f80fd5b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61066282610639565b9050919050565b61067281610658565b811461067c575f80fd5b50565b5f8135905061068d81610669565b92915050565b5f67ffffffffffffffff8211156106ad576106ac61058a565b5b602082029050602081019050919050565b5f8160070b9050919050565b6106d3816106be565b81146106dd575f80fd5b50565b5f813590506106ee816106ca565b92915050565b5f6040828403121561070957610708610631565b5b61071360406105e8565b90505f6107228482850161067f565b5f830152506020610735848285016106e0565b60208301525092915050565b5f61075361074e84610693565b6105e8565b905080838252602082019050604084028301858111156107765761077561062d565b5b835b8181101561079f578061078b88826106f4565b845260208401935050604081019050610778565b5050509392505050565b5f82601f8301126107bd576107bc610576565b5b81356107cd848260208601610741565b91505092915050565b5f67ffffffffffffffff8211156107f0576107ef61058a565b5b602082029050602081019050919050565b5f6060828403121561081657610815610631565b5b61082060606105e8565b90505f61082f8482850161067f565b5f8301525060206108428482850161067f565b6020830152506040610856848285016106e0565b60408301525092915050565b5f61087461086f846107d6565b6105e8565b905080838252602082019050606084028301858111156108975761089661062d565b5b835b818110156108c057806108ac8882610801565b845260208401935050606081019050610899565b5050509392505050565b5f82601f8301126108de576108dd610576565b5b81356108ee848260208601610862565b91505092915050565b5f6060828403121561090c5761090b610631565b5b61091660606105e8565b90505f6109258482850161067f565b5f83015250602082013567ffffffffffffffff81111561094857610947610635565b5b610954848285016107a9565b602083015250604082013567ffffffffffffffff81111561097857610977610635565b5b610984848285016108ca565b60408301525092915050565b5f6109a261099d84610602565b6105e8565b905080838252602082019050602084028301858111156109c5576109c461062d565b5b835b81811015610a0c57803567ffffffffffffffff8111156109ea576109e9610576565b5b8086016109f789826108f7565b855260208501945050506020810190506109c7565b5050509392505050565b5f82601f830112610a2a57610a29610576565b5b8135610a3a848260208601610990565b91505092915050565b5f60208284031215610a5857610a5761056e565b5b5f82013567ffffffffffffffff811115610a7557610a74610572565b5b610a8184828501610a16565b91505092915050565b5f610a9482610639565b9050919050565b610aa481610a8a565b8114610aae575f80fd5b50565b5f81359050610abf81610a9b565b92915050565b5f60208284031215610ada57610ad961056e565b5b5f610ae784828501610ab1565b91505092915050565b5f60208284031215610b0557610b0461056e565b5b5f610b128482850161067f565b91505092915050565b5f819050919050565b610b2d81610b1b565b82525050565b5f602082019050610b465f830184610b24565b92915050565b5f819050919050565b610b5e81610b4c565b8114610b68575f80fd5b50565b5f81359050610b7981610b55565b92915050565b5f8060408385031215610b9557610b9461056e565b5b5f610ba285828601610ab1565b9250506020610bb385828601610b6b565b9150509250929050565b5f82825260208201905092915050565b7f43727970746f205472616e73666572204661696c6564000000000000000000005f82015250565b5f610c01601683610bbd565b9150610c0c82610bcd565b602082019050919050565b5f6020820190508181035f830152610c2e81610bf5565b9050919050565b7f4661696c656420746f2073656e642045746865720000000000000000000000005f82015250565b5f610c69601483610bbd565b9150610c7482610c35565b602082019050919050565b5f6020820190508181035f830152610c9681610c5d565b9050919050565b610ca681610658565b82525050565b5f602082019050610cbf5f830184610c9d565b92915050565b5f81519050919050565b5f81905092915050565b5f5b83811015610cf6578082015181840152602081019050610cdb565b5f8484015250505050565b5f610d0b82610cc5565b610d158185610ccf565b9350610d25818560208601610cd9565b80840191505092915050565b5f610d3c8284610d01565b915081905092915050565b5f8160030b9050919050565b610d5c81610d47565b8114610d66575f80fd5b50565b5f81519050610d7781610d53565b92915050565b5f60208284031215610d9257610d9161056e565b5b5f610d9f84828501610d69565b91505092915050565b50565b5f610db65f83610ccf565b9150610dc182610da8565b5f82019050919050565b5f610dd582610dab565b9150819050919050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b610e1181610658565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b610e49816106be565b82525050565b604082015f820151610e635f850182610e08565b506020820151610e766020850182610e40565b50505050565b5f610e878383610e4f565b60408301905092915050565b5f602082019050919050565b5f610ea982610e17565b610eb38185610e21565b9350610ebe83610e31565b805f5b83811015610eee578151610ed58882610e7c565b9750610ee083610e93565b925050600181019050610ec1565b5085935050505092915050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b606082015f820151610f385f850182610e08565b506020820151610f4b6020850182610e08565b506040820151610f5e6040850182610e40565b50505050565b5f610f6f8383610f24565b60608301905092915050565b5f602082019050919050565b5f610f9182610efb565b610f9b8185610f05565b9350610fa683610f15565b805f5b83811015610fd6578151610fbd8882610f64565b9750610fc883610f7b565b925050600181019050610fa9565b5085935050505092915050565b5f606083015f830151610ff85f860182610e08565b50602083015184820360208601526110108282610e9f565b9150506040830151848203604086015261102a8282610f87565b9150508091505092915050565b5f6110428383610fe3565b905092915050565b5f602082019050919050565b5f61106082610ddf565b61106a8185610de9565b93508360208202850161107c85610df9565b805f5b858110156110b757848403895281516110988582611037565b94506110a38361104a565b925060208a0199505060018101905061107f565b50829750879550505050505092915050565b5f6020820190508181035f8301526110e18184611056565b90509291505056fea2646970667358221220081b5a5770414f8313d068205ab8197aaffd438a2f4abcd278e102da2996a30564736f6c63430008180033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.json
deleted file mode 100644
index 08f7d1673ccb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.json
+++ /dev/null
@@ -1,142 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "sendViaCall",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "sendViaSend",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "sendViaTransfer",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "sendViaTransferWithAmount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "transferMultipleTokens",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.bin
deleted file mode 100644
index 50f5ab4e0aa9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610e48380380610e488339818101604052810190610032919061008d565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506100ff565b600081519050610087816100e8565b92915050565b60006020828403121561009f57600080fd5b60006100ad84828501610078565b91505092915050565b60006100c1826100c8565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6100f1816100b6565b81146100fc57600080fd5b50565b610d3a8061010e6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806324abd2351461005157806333e846e21461006d5780637c41ad2c14610089578063a8492d02146100b9575b600080fd5b61006b6004803603810190610066919061071c565b6100d5565b005b610087600480360381019061008291906107bb565b61023e565b005b6100a3600480360381019061009e91906106f3565b6103a4565b6040516100b09190610adb565b60405180910390f35b6100d360048036038101906100ce919061077f565b6104b9565b005b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16868686866040516024016101279493929190610a2f565b6040516020818303038152906040527fa4aa39b1000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101b191906109fd565b600060405180830381855af49150503d80600081146101ec576040519150601f19603f3d011682016040523d82523d6000602084013e6101f1565b606091505b509150915081610236576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161022d90610af6565b60405180910390fd5b505050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1685858560405160240161028e93929190610a9d565b6040516020818303038152906040527f1a1eb403000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161031891906109fd565b600060405180830381855af49150503d8060008114610353576040519150601f19603f3d011682016040523d82523d6000602084013e610358565b606091505b50915091508161039d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161039490610b16565b60405180910390fd5b5050505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016103db9190610a14565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161044591906109fd565b6000604051808303816000865af19150503d8060008114610482576040519150601f19603f3d011682016040523d82523d6000602084013e610487565b606091505b5091509150816104985760156104ad565b808060200190518101906104ac9190610822565b5b60030b92505050919050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168484604051602401610507929190610a74565b6040516020818303038152906040527fc7b2d336000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161059191906109fd565b600060405180830381855af49150503d80600081146105cc576040519150601f19603f3d011682016040523d82523d6000602084013e6105d1565b606091505b509150915081610616576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161060d90610b36565b60405180910390fd5b50505050565b60008135905061062b81610ca8565b92915050565b600082601f83011261064257600080fd5b813561065561065082610b83565b610b56565b9150818183526020840193506020810190508385602084028201111561067a57600080fd5b60005b838110156106aa578161069088826106c9565b84526020840193506020830192505060018101905061067d565b5050505092915050565b6000815190506106c381610cbf565b92915050565b6000813590506106d881610cd6565b92915050565b6000813590506106ed81610ced565b92915050565b60006020828403121561070557600080fd5b60006107138482850161061c565b91505092915050565b6000806000806080858703121561073257600080fd5b60006107408782880161061c565b94505060206107518782880161061c565b93505060406107628782880161061c565b9250506060610773878288016106c9565b91505092959194509250565b6000806040838503121561079257600080fd5b60006107a08582860161061c565b92505060206107b1858286016106de565b9150509250929050565b6000806000606084860312156107d057600080fd5b60006107de8682870161061c565b93505060206107ef868287016106de565b925050604084013567ffffffffffffffff81111561080c57600080fd5b61081886828701610631565b9150509250925092565b60006020828403121561083457600080fd5b6000610842848285016106b4565b91505092915050565b60006108578383610910565b60208301905092915050565b61086c81610c0b565b82525050565b600061087d82610bbb565b6108878185610bde565b935061089283610bab565b8060005b838110156108c35781516108aa888261084b565b97506108b583610bd1565b925050600181019050610896565b5085935050505092915050565b60006108db82610bc6565b6108e58185610bef565b93506108f5818560208601610c75565b80840191505092915050565b61090a81610c1d565b82525050565b61091981610c34565b82525050565b61092881610c34565b82525050565b600061093b601e83610bfa565b91507f44656c6567617465207472616e736665722063616c6c206661696c65642100006000830152602082019050919050565b600061097b601a83610bfa565b91507f44656c6567617465206275726e2063616c6c206661696c6564210000000000006000830152602082019050919050565b60006109bb601a83610bfa565b91507f44656c6567617465206d696e742063616c6c206661696c6564210000000000006000830152602082019050919050565b6109f781610c61565b82525050565b6000610a0982846108d0565b915081905092915050565b6000602082019050610a296000830184610863565b92915050565b6000608082019050610a446000830187610863565b610a516020830186610863565b610a5e6040830185610863565b610a6b606083018461091f565b95945050505050565b6000604082019050610a896000830185610863565b610a9660208301846109ee565b9392505050565b6000606082019050610ab26000830186610863565b610abf60208301856109ee565b8181036040830152610ad18184610872565b9050949350505050565b6000602082019050610af06000830184610901565b92915050565b60006020820190508181036000830152610b0f8161092e565b9050919050565b60006020820190508181036000830152610b2f8161096e565b9050919050565b60006020820190508181036000830152610b4f816109ae565b9050919050565b6000604051905081810181811067ffffffffffffffff82111715610b7957600080fd5b8060405250919050565b600067ffffffffffffffff821115610b9a57600080fd5b602082029050602081019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000610c1682610c41565b9050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b60005b83811015610c93578082015181840152602081019050610c78565b83811115610ca2576000848401525b50505050565b610cb181610c0b565b8114610cbc57600080fd5b50565b610cc881610c27565b8114610cd357600080fd5b50565b610cdf81610c34565b8114610cea57600080fd5b50565b610cf681610c61565b8114610d0157600080fd5b5056fea26469706673582212200813d9b0b86eb86717e2d026bb177167d34da0319bbdc194eb8c4fc9e0b0ab9864736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.json
deleted file mode 100644
index ac251c9ea04b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "serviceContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      }
-    ],
-    "name": "mintDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "transferDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.bin
deleted file mode 100644
index 83ea24046e08..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506102bf806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80639bfde30814610030575b600080fd5b6100726004803603602081101561004657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610074565b005b600061007f82610101565b60070b9050601660030b81146100fd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e2064656c6574696f6e206661696c6564210000000000000000000081525060200191505060405180910390fd5b5050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff1663f069f71260e01b85604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106101de57805182526020820191506020810190506020830392506101bb565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610240576040519150601f19603f3d011682016040523d82523d6000602084013e610245565b606091505b50915091508161025657601561027d565b80806020019051602081101561026b57600080fd5b81019080805190602001909291905050505b60030b9250505091905056fea264697066735822122086bac58f1216adc266d1b0144dfe881263670b634eab0f07e8897e885a959b8f64736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.json
deleted file mode 100644
index 84370bb30860..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "tokenDelete",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.bin
deleted file mode 100644
index bb1cc29d1dcc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526101676000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555034801561005257600080fd5b5061031b806100626000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063efc3882614610030575b600080fd5b61004a600480360381019061004591906101be565b61004c565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b8383677fffffffffffffff6040516024016100a893929190610226565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161011291906102ce565b6000604051808303816000865af19150503d806000811461014f576040519150601f19603f3d011682016040523d82523d6000602084013e610154565b606091505b5050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061018b82610160565b9050919050565b61019b81610180565b81146101a657600080fd5b50565b6000813590506101b881610192565b92915050565b600080604083850312156101d5576101d461015b565b5b60006101e3858286016101a9565b92505060206101f4858286016101a9565b9150509250929050565b61020781610180565b82525050565b6000819050919050565b6102208161020d565b82525050565b600060608201905061023b60008301866101fe565b61024860208301856101fe565b6102556040830184610217565b949350505050565b600081519050919050565b600081905092915050565b60005b83811015610291578082015181840152602081019050610276565b60008484015250505050565b60006102a88261025d565b6102b28185610268565b93506102c2818560208601610273565b80840191505092915050565b60006102da828461029d565b91508190509291505056fea2646970667358221220e0b91d319d647fe8aca2e0e8d5106dc83ebd415a4c057997c766e48cc226fb0164736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.json b/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.json
deleted file mode 100644
index 3f1d6abe2b54..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_attacker",
-          "type": "address"
-        }
-      ],
-      "name": "doIndirectApproval",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.bin
deleted file mode 100644
index 8e315789f22b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526101676000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555034801561005257600080fd5b50612c03806100626000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c8063982aa0d811610071578063982aa0d81461013a5780639dbd1d0c14610156578063a7716dd014610172578063d4827c0c1461018e578063d84df1eb146101aa578063e04e44c6146101c6576100a9565b80631c9c3f4f146100ae57806323bf4a30146100ca5780634212b5ce146100e6578063616c45081461010257806378257c251461011e575b600080fd5b6100c860048036038101906100c39190612465565b6101e2565b005b6100e460048036038101906100df9190612465565b6104d2565b005b61010060048036038101906100fb91906124b8565b610616565b005b61011c600480360381019061011791906124f8565b611475565b005b610138600480360381019061013391906124f8565b611837565b005b610154600480360381019061014f91906124b8565b611c3a565b005b610170600480360381019061016b91906124b8565b611d7b565b005b61018c60048036038101906101879190612465565b611eb9565b005b6101a860048036038101906101a391906124b8565b611ffd565b005b6101c460048036038101906101bf91906124b8565b61213b565b005b6101e060048036038101906101db9190612573565b612279565b005b600060606000600267ffffffffffffffff811115610203576102026125a0565b5b6040519080825280602002602001820160405280156102315781602001602082028036833780820191505090505b5090508481600081518110610249576102486125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508381600181518110610298576102976125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000600267ffffffffffffffff8111156102ef576102ee6125a0565b5b60405190808252806020026020018201604052801561031d5781602001602082028036833780820191505090505b5090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81600081518110610355576103546125cf565b5b602002602001019060070b908160070b8152505060018160018151811061037f5761037e6125cf565b5b602002602001019060070b908160070b8152505060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b8884846040516024016103e793929190612796565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610451919061284c565b6000604051808303816000865af19150503d806000811461048e576040519150601f19603f3d011682016040523d82523d6000602084013e610493565b606091505b508094508195505050836104a657600080fd5b6016838060200190518101906104bc919061289c565b60030b146104c957600080fd5b50505050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b868686600160405160240161052d94939291906128d8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610597919061284c565b6000604051808303816000865af19150503d80600081146105d4576040519150601f19603f3d011682016040523d82523d6000602084013e6105d9565b606091505b508092508193505050816105ec57600080fd5b601681806020019051810190610602919061289c565b60030b1461060f57600080fd5b5050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161066a919061291d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106d4919061284c565b6000604051808303816000865af19150503d8060008114610711576040519150601f19603f3d011682016040523d82523d6000602084013e610716565b606091505b5080925081935050508161072957600080fd5b60168180602001905181019061073f919061289c565b60030b1461074c57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b8560405160240161079c919061291d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610806919061284c565b6000604051808303816000865af19150503d8060008114610843576040519150601f19603f3d011682016040523d82523d6000602084013e610848565b606091505b5080925081935050508161085b57600080fd5b601681806020019051810190610871919061289c565b60030b1461087e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b856001600067ffffffffffffffff8111156108db576108da6125a0565b5b60405190808252806020026020018201604052801561090e57816020015b60608152602001906001900390816108f95790505b5060405160240161092193929190612a78565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161098b919061284c565b6000604051808303816000865af19150503d80600081146109c8576040519150601f19603f3d011682016040523d82523d6000602084013e6109cd565b606091505b508092508193505050816109e057600080fd5b6016818060200190518101906109f6919061289c565b60030b14610a0357600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b856001600067ffffffffffffffff811115610a6057610a5f6125a0565b5b604051908082528060200260200182016040528015610a8e5781602001602082028036833780820191505090505b50604051602401610aa193929190612ab6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b0b919061284c565b6000604051808303816000865af19150503d8060008114610b48576040519150601f19603f3d011682016040523d82523d6000602084013e610b4d565b606091505b50809250819350505081610b6057600080fd5b601681806020019051810190610b76919061289c565b60030b14610b8357600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8585604051602401610bd5929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610c3f919061284c565b6000604051808303816000865af19150503d8060008114610c7c576040519150601f19603f3d011682016040523d82523d6000602084013e610c81565b606091505b50809250819350505081610c9457600080fd5b601681806020019051810190610caa919061289c565b60030b14610cb757600080fd5b6000600267ffffffffffffffff811115610cd457610cd36125a0565b5b604051908082528060200260200182016040528015610d025781602001602082028036833780820191505090505b5090503081600081518110610d1a57610d196125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508381600181518110610d6957610d686125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000600267ffffffffffffffff811115610dc057610dbf6125a0565b5b604051908082528060200260200182016040528015610dee5781602001602082028036833780820191505090505b5090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81600081518110610e2657610e256125cf565b5b602002602001019060070b908160070b81525050600181600181518110610e5057610e4f6125cf565b5b602002602001019060070b908160070b8152505060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b878484604051602401610eb893929190612796565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f22919061284c565b6000604051808303816000865af19150503d8060008114610f5f576040519150601f19603f3d011682016040523d82523d6000602084013e610f64565b606091505b50809450819550505083610f7757600080fd5b601683806020019051810190610f8d919061289c565b60030b14610f9a57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16635b8f858460e01b8787604051602401610fec929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611056919061284c565b6000604051808303816000865af19150503d8060008114611093576040519150601f19603f3d011682016040523d82523d6000602084013e611098565b606091505b508094508195505050836110ab57600080fd5b6016838060200190518101906110c1919061289c565b60030b146110ce57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166352f9138760e01b8787604051602401611120929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161118a919061284c565b6000604051808303816000865af19150503d80600081146111c7576040519150601f19603f3d011682016040523d82523d6000602084013e6111cc565b606091505b508094508195505050836111df57600080fd5b6016838060200190518101906111f5919061289c565b60030b1461120257600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16639790686d60e01b8787600160405160240161125793929190612b3c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112c1919061284c565b6000604051808303816000865af19150503d80600081146112fe576040519150601f19603f3d011682016040523d82523d6000602084013e611303565b606091505b5080945081955050508361131657600080fd5b60168380602001905181019061132c919061289c565b60030b1461133957600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b878760405160240161138b929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516113f5919061284c565b6000604051808303816000865af19150503d8060008114611432576040519150601f19603f3d011682016040523d82523d6000602084013e611437565b606091505b5080945081955050508361144a57600080fd5b601683806020019051810190611460919061289c565b60030b1461146d57600080fd5b505050505050565b600060606000600267ffffffffffffffff811115611496576114956125a0565b5b6040519080825280602002602001820160405280156114c45781602001602082028036833780820191505090505b5090506000600267ffffffffffffffff8111156114e4576114e36125a0565b5b6040519080825280602002602001820160405280156115125781602001602082028036833780820191505090505b509050878260008151811061152a576115296125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508582600181518110611579576115786125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505086816000815181106115c8576115c76125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508481600181518110611617576116166125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000600267ffffffffffffffff81111561166e5761166d6125a0565b5b60405190808252806020026020018201604052801561169c5781602001602082028036833780820191505090505b5090506002816000815181106116b5576116b46125cf565b5b602002602001019060070b908160070b815250506003816001815181106116df576116de6125cf565b5b602002602001019060070b908160070b8152505060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b8b8585856040516024016117499493929190612b73565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516117b3919061284c565b6000604051808303816000865af19150503d80600081146117f0576040519150601f19603f3d011682016040523d82523d6000602084013e6117f5565b606091505b5080955081965050508461180857600080fd5b60168480602001905181019061181e919061289c565b60030b1461182b57600080fd5b50505050505050505050565b600060606000600467ffffffffffffffff811115611858576118576125a0565b5b6040519080825280602002602001820160405280156118865781602001602082028036833780820191505090505b509050868160008151811061189e5761189d6125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505085816001815181106118ed576118ec6125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050848160028151811061193c5761193b6125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050838160038151811061198b5761198a6125cf565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000600467ffffffffffffffff8111156119e2576119e16125a0565b5b604051908082528060200260200182016040528015611a105781602001602082028036833780820191505090505b5090507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81600081518110611a4857611a476125cf565b5b602002602001019060070b908160070b81525050600181600181518110611a7257611a716125cf565b5b602002602001019060070b908160070b815250507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81600281518110611abb57611aba6125cf565b5b602002602001019060070b908160070b81525050600181600381518110611ae557611ae46125cf565b5b602002602001019060070b908160070b8152505060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b8a8484604051602401611b4d93929190612796565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bb7919061284c565b6000604051808303816000865af19150503d8060008114611bf4576040519150601f19603f3d011682016040523d82523d6000602084013e611bf9565b606091505b50809450819550505083611c0c57600080fd5b601683806020019051810190611c22919061289c565b60030b14611c2f57600080fd5b505050505050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16639790686d60e01b85856001604051602401611c9393929190612b3c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611cfd919061284c565b6000604051808303816000865af19150503d8060008114611d3a576040519150601f19603f3d011682016040523d82523d6000602084013e611d3f565b606091505b50809250819350505081611d5257600080fd5b601681806020019051810190611d68919061289c565b60030b14611d7557600080fd5b50505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8585604051602401611dd1929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611e3b919061284c565b6000604051808303816000865af19150503d8060008114611e78576040519150601f19603f3d011682016040523d82523d6000602084013e611e7d565b606091505b50809250819350505081611e9057600080fd5b601681806020019051810190611ea6919061289c565b60030b14611eb357600080fd5b50505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b8686866001604051602401611f1494939291906128d8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611f7e919061284c565b6000604051808303816000865af19150503d8060008114611fbb576040519150601f19603f3d011682016040523d82523d6000602084013e611fc0565b606091505b50809250819350505081611fd357600080fd5b601681806020019051810190611fe9919061289c565b60030b14611ff657600080fd5b5050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16635b8f858460e01b8585604051602401612053929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516120bd919061284c565b6000604051808303816000865af19150503d80600081146120fa576040519150601f19603f3d011682016040523d82523d6000602084013e6120ff565b606091505b5080925081935050508161211257600080fd5b601681806020019051810190612128919061289c565b60030b1461213557600080fd5b50505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b8585604051602401612191929190612af4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516121fb919061284c565b6000604051808303816000865af19150503d8060008114612238576040519150601f19603f3d011682016040523d82523d6000602084013e61223d565b606091505b5080925081935050508161225057600080fd5b601681806020019051810190612266919061289c565b60030b1461227357600080fd5b50505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b846001600067ffffffffffffffff8111156122da576122d96125a0565b5b6040519080825280602002602001820160405280156123085781602001602082028036833780820191505090505b5060405160240161231b93929190612ab6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051612385919061284c565b6000604051808303816000865af19150503d80600081146123c2576040519150601f19603f3d011682016040523d82523d6000602084013e6123c7565b606091505b508092508193505050816123da57600080fd5b6016818060200190518101906123f0919061289c565b60030b146123fd57600080fd5b505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061243282612407565b9050919050565b61244281612427565b811461244d57600080fd5b50565b60008135905061245f81612439565b92915050565b60008060006060848603121561247e5761247d612402565b5b600061248c86828701612450565b935050602061249d86828701612450565b92505060406124ae86828701612450565b9150509250925092565b600080604083850312156124cf576124ce612402565b5b60006124dd85828601612450565b92505060206124ee85828601612450565b9150509250929050565b600080600080600060a0868803121561251457612513612402565b5b600061252288828901612450565b955050602061253388828901612450565b945050604061254488828901612450565b935050606061255588828901612450565b925050608061256688828901612450565b9150509295509295909350565b60006020828403121561258957612588612402565b5b600061259784828501612450565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b61260781612427565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61264281612427565b82525050565b60006126548383612639565b60208301905092915050565b6000602082019050919050565b60006126788261260d565b6126828185612618565b935061268d83612629565b8060005b838110156126be5781516126a58882612648565b97506126b083612660565b925050600181019050612691565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60008160070b9050919050565b61270d816126f7565b82525050565b600061271f8383612704565b60208301905092915050565b6000602082019050919050565b6000612743826126cb565b61274d81856126d6565b9350612758836126e7565b8060005b838110156127895781516127708882612713565b975061277b8361272b565b92505060018101905061275c565b5085935050505092915050565b60006060820190506127ab60008301866125fe565b81810360208301526127bd818561266d565b905081810360408301526127d18184612738565b9050949350505050565b600081519050919050565b600081905092915050565b60005b8381101561280f5780820151818401526020810190506127f4565b60008484015250505050565b6000612826826127db565b61283081856127e6565b93506128408185602086016127f1565b80840191505092915050565b6000612858828461281b565b915081905092915050565b60008160030b9050919050565b61287981612863565b811461288457600080fd5b50565b60008151905061289681612870565b92915050565b6000602082840312156128b2576128b1612402565b5b60006128c084828501612887565b91505092915050565b6128d2816126f7565b82525050565b60006080820190506128ed60008301876125fe565b6128fa60208301866125fe565b61290760408301856125fe565b61291460608301846128c9565b95945050505050565b600060208201905061293260008301846125fe565b92915050565b600067ffffffffffffffff82169050919050565b61295581612938565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b6000601f19601f8301169050919050565b60006129b4826127db565b6129be8185612987565b93506129ce8185602086016127f1565b6129d781612998565b840191505092915050565b60006129ee83836129a9565b905092915050565b6000602082019050919050565b6000612a0e8261295b565b612a188185612966565b935083602082028501612a2a85612977565b8060005b85811015612a665784840389528151612a4785826129e2565b9450612a52836129f6565b925060208a01995050600181019050612a2e565b50829750879550505050505092915050565b6000606082019050612a8d60008301866125fe565b612a9a602083018561294c565b8181036040830152612aac8184612a03565b9050949350505050565b6000606082019050612acb60008301866125fe565b612ad8602083018561294c565b8181036040830152612aea8184612738565b9050949350505050565b6000604082019050612b0960008301856125fe565b612b1660208301846125fe565b9392505050565b600063ffffffff82169050919050565b612b3681612b1d565b82525050565b6000606082019050612b5160008301866125fe565b612b5e60208301856125fe565b612b6b6040830184612b2d565b949350505050565b6000608082019050612b8860008301876125fe565b8181036020830152612b9a818661266d565b90508181036040830152612bae818561266d565b90508181036060830152612bc28184612738565b90509594505050505056fea264697066735822122026e5a175037081a2a9965d15cff3686a4c87bf89bd73e25210c3c5e3b0becad364736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.json b/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.json
deleted file mode 100644
index dad4e5ab8b69..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"justBurnFungible","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"associatedAccount","type":"address"}],"name":"justFreezeAccount","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"associatedAccount","type":"address"}],"name":"justGrantKyc","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"associatedAccount","type":"address"}],"name":"justRevokeKyc","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"associatedAccount","type":"address"}],"name":"justWipeFungible","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"associatedAccount","type":"address"}],"name":"manageEverythingForFungible","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"fromA","type":"address"},{"internalType":"address","name":"toA","type":"address"},{"internalType":"address","name":"fromB","type":"address"},{"internalType":"address","name":"toB","type":"address"}],"name":"transferNFTSerialNos2And3ToFromToOthers","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"}],"name":"transferSerialNo1FromToOthers","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"}],"name":"transferTokenUnitFromToOthers","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"fromA","type":"address"},{"internalType":"address","name":"toA","type":"address"},{"internalType":"address","name":"fromB","type":"address"},{"internalType":"address","name":"toB","type":"address"}],"name":"transferTokenUnitsFromToOthers","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"controlledSpender","type":"address"},{"internalType":"address","name":"beneficiary","type":"address"}],"name":"transferViaThresholdContractKey","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.bin
deleted file mode 100644
index 8861bfff8ca3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610118806100136000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063a89000c814602d575b600080fd5b60436004803603810190603f919060ba565b6045565b005b8073ffffffffffffffffffffffffffffffffffffffff16ff5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000608c826063565b9050919050565b609a816083565b811460a457600080fd5b50565b60008135905060b4816093565b92915050565b60006020828403121560cd5760cc605e565b5b600060d98482850160a7565b9150509291505056fea2646970667358221220b176eeee7b83f229c73d61281da65ad81e8e6f40276abaf4b279a79ac4e027dd64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.json
deleted file mode 100644
index 4116d7cf9849..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "relinquishFundsTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.bin
deleted file mode 100644
index 7a6a5f53d3e4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610286806100136000396000f3fe60806040526004361061001e5760003560e01c806321bea7cc14610023575b600080fd5b61003d60048036038101906100389190610162565b61003f565b005b600082905060008290507ff3a1fccdf4778ea6c44fd680f7bdbf5d53a02733614e6e82354bfcb238eb611a8260405161007891906101b1565b60405180910390a17ff3a1fccdf4778ea6c44fd680f7bdbf5d53a02733614e6e82354bfcb238eb611a816040516100af91906101b1565b60405180910390a18173ffffffffffffffffffffffffffffffffffffffff166108fc60019081150290604051600060405180830381858888f193505050501580156100fe573d6000803e3d6000fd5b508073ffffffffffffffffffffffffffffffffffffffff166108fc60019081150290604051600060405180830381858888f19350505050158015610146573d6000803e3d6000fd5b5050505050565b60008135905061015c81610239565b92915050565b6000806040838503121561017957610178610234565b5b60006101878582860161014d565b92505060206101988582860161014d565b9150509250929050565b6101ab816101fe565b82525050565b60006020820190506101c660008301846101a2565b92915050565b60006101d7826101de565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061020982610210565b9050919050565b600061021b82610222565b9050919050565b600061022d826101de565b9050919050565b600080fd5b610242816101cc565b811461024d57600080fd5b5056fea2646970667358221220b7144d726d0ba5e7f32ef6aa6267025759688eadcceb2aecd738abec9e666fd064736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.json b/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.json
deleted file mode 100644
index e7094f838c78..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "somebody",
-        "type": "address"
-      }
-    ],
-    "name": "Target",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "toFirst",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "toSecond",
-        "type": "address"
-      }
-    ],
-    "name": "donate",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20ABI/ERC20ABI.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20ABI/ERC20ABI.json
deleted file mode 100644
index 3b0ab2f1ab43..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20ABI/ERC20ABI.json
+++ /dev/null
@@ -1,222 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_spender",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "decimals",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "name": "balance",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "name": "_spender",
-        "type": "address"
-      }
-    ],
-    "name": "allowance",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.bin
deleted file mode 100644
index 55b4f6393402..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610a57806100206000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063beabacc81161008c578063e4dc2aa411610066578063e4dc2aa414610181578063f4b79da514610194578063f7888aec146101a7578063f79c7568146101ba57600080fd5b8063beabacc814610148578063d449a8321461015b578063e1f21c671461016e57600080fd5b806301984892146100d457806315dacbea146100e95780631f84b2b7146100fc578063927da1051461010f57806398dca5be14610122578063a86e357614610135575b600080fd5b6100e76100e2366004610746565b6101cd565b005b6100e76100f7366004610768565b610237565b6100e761010a3660046107b3565b6102b9565b6100e761011d3660046107ef565b610333565b6100e7610130366004610768565b6103ab565b6100e7610143366004610746565b6103e8565b6100e76101563660046107b3565b610426565b6100e7610169366004610746565b61049a565b6100e761017c3660046107b3565b6104fc565b6100e761018f366004610746565b610531565b6100e76101a23660046107b3565b610593565b6100e76101b5366004610832565b610637565b6100e76101c8366004610865565b6106a6565b806001600160a01b03166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa15801561020b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261023391908101906108d1565b5050565b6040516323b872dd60e01b81526001600160a01b0384811660048301528381166024830152604482018390528516906323b872dd906064016020604051808303816000875af115801561028e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b2919061097e565b5050505050565b60405163a9059cbb60e01b81526001600160a01b0383811660048301526024820183905284169063a9059cbb906044015b6020604051808303816000875af1158015610309573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032d919061097e565b50600080fd5b604051636eb1769f60e11b81526001600160a01b038381166004830152828116602483015284169063dd62ed3e90604401602060405180830381865afa158015610381573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103a591906109a0565b50505050565b6040516323b872dd60e01b81526001600160a01b0384811660048301528381166024830152604482018390528516906323b872dd906064016102ea565b806001600160a01b03166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa15801561020b573d6000803e3d6000fd5b60405163a9059cbb60e01b81526001600160a01b0383811660048301526024820183905284169063a9059cbb906044015b6020604051808303816000875af1158015610476573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103a5919061097e565b806001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104d8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023391906109b9565b60405163095ea7b360e01b81526001600160a01b0383811660048301526024820183905284169063095ea7b390604401610457565b806001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561056f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023391906109a0565b6040516001600160a01b03838116602483015260448201839052600091829186169060640160408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052516105ed91906109dc565b600060405180830381855af49150503d8060008114610628576040519150601f19603f3d011682016040523d82523d6000602084013e61062d565b606091505b5050505050505050565b6040516370a0823160e01b81526001600160a01b0382811660048301528316906370a0823190602401602060405180830381865afa15801561067d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106a191906109a0565b505050565b60005b818110156106a157826001600160a01b03166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa1580156106ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261071791908101906108d1565b5080610722816109f8565b9150506106a9565b80356001600160a01b038116811461074157600080fd5b919050565b60006020828403121561075857600080fd5b6107618261072a565b9392505050565b6000806000806080858703121561077e57600080fd5b6107878561072a565b93506107956020860161072a565b92506107a36040860161072a565b9396929550929360600135925050565b6000806000606084860312156107c857600080fd5b6107d18461072a565b92506107df6020850161072a565b9150604084013590509250925092565b60008060006060848603121561080457600080fd5b61080d8461072a565b925061081b6020850161072a565b91506108296040850161072a565b90509250925092565b6000806040838503121561084557600080fd5b61084e8361072a565b915061085c6020840161072a565b90509250929050565b6000806040838503121561087857600080fd5b6108818361072a565b946020939093013593505050565b634e487b7160e01b600052604160045260246000fd5b60005b838110156108c05781810151838201526020016108a8565b838111156103a55750506000910152565b6000602082840312156108e357600080fd5b815167ffffffffffffffff808211156108fb57600080fd5b818401915084601f83011261090f57600080fd5b8151818111156109215761092161088f565b604051601f8201601f19908116603f011681019083821181831017156109495761094961088f565b8160405282815287602084870101111561096257600080fd5b6109738360208301602088016108a5565b979650505050505050565b60006020828403121561099057600080fd5b8151801515811461076157600080fd5b6000602082840312156109b257600080fd5b5051919050565b6000602082840312156109cb57600080fd5b815160ff8116811461076157600080fd5b600082516109ee8184602087016108a5565b9190910192915050565b6000600019821415610a1a57634e487b7160e01b600052601160045260246000fd5b506001019056fea264697066735822122093db7d2bdd096250add8efe6cc9ba4a1f7cf138d410b54489f6aebf44296df3f64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.json
deleted file mode 100644
index f947ef412bd3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      }
-    ],
-    "name": "allowance",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "decimals",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "name",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "times",
-        "type": "uint256"
-      }
-    ],
-    "name": "nameNTimes",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "symbol",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "totalSupply",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromThenRevert",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferThenRevert",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.bin
deleted file mode 100644
index d87ed1e61830..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506102e9806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063efc3882614610030575b600080fd5b61004a6004803603810190610045919061019a565b61004c565b005b8173ffffffffffffffffffffffffffffffffffffffff1663095ea7b360e01b82677fffffffffffffff604051602401610086929190610202565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516100f0919061029c565b600060405180830381855af49150503d806000811461012b576040519150601f19603f3d011682016040523d82523d6000602084013e610130565b606091505b5050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101678261013c565b9050919050565b6101778161015c565b811461018257600080fd5b50565b6000813590506101948161016e565b92915050565b600080604083850312156101b1576101b0610137565b5b60006101bf85828601610185565b92505060206101d085828601610185565b9150509250929050565b6101e38161015c565b82525050565b6000819050919050565b6101fc816101e9565b82525050565b600060408201905061021760008301856101da565b61022460208301846101f3565b9392505050565b600081519050919050565b600081905092915050565b60005b8381101561025f578082015181840152602081019050610244565b60008484015250505050565b60006102768261022b565b6102808185610236565b9350610290818560208601610241565b80840191505092915050565b60006102a8828461026b565b91508190509291505056fea26469706673582212206391ec956eb983502c87cc13f15a0ac26c8a6ee651bfbe0175c1b5b55cacde6d64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.json
deleted file mode 100644
index 3f1d6abe2b54..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_attacker",
-          "type": "address"
-        }
-      ],
-      "name": "doIndirectApproval",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ABI/ERC721ABI.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ABI/ERC721ABI.json
deleted file mode 100644
index e091b57549a6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ABI/ERC721ABI.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "inputs": [{"internalType": "address", "name": "owner", "type": "address"}],
-    "name": "balanceOf",
-    "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}],
-    "payable": false, "stateMutability": "view", "type": "function", "constant": true
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [{"internalType": "string", "name": "", "type": "string"}],
-    "stateMutability": "view", "type": "function", "constant": true
-  },
-  {
-    "inputs": [{"internalType": "uint256", "name": "tokenId", "type": "uint256"}],
-    "name": "ownerOf",
-    "outputs": [{"internalType": "address", "name": "", "type": "address"}],
-    "payable": false, "stateMutability": "view", "type": "function", "constant": true
-  },
-  {
-    "inputs": [{"internalType": "uint256", "name": "tokenId", "type": "uint256"}],
-    "name": "tokenURI",
-    "outputs": [{"internalType": "string", "name": "", "type": "string"}],
-    "payable": false, "stateMutability": "view", "type": "function", "constant": true
-  },
-  {
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [{"internalType": "string", "name": "", "type": "string"}],
-    "stateMutability": "view", "type": "function", "constant": true
-  },
-  {
-    "inputs": [],
-    "name": "totalSupply",
-    "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}],
-    "stateMutability": "view", "type": "function", "constant": true
-  },
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.bin
deleted file mode 100644
index 59ea43320dd0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506112a2806100206000396000f3fe608060405234801561001057600080fd5b50600436106101005760003560e01c8063a86e357611610097578063e4dc2aa411610066578063e4dc2aa414610255578063e9dc637514610271578063f49f40db1461028d578063f7888aec146102a957610100565b8063a86e3576146101e5578063cb60f1bf14610201578063d9fc4b611461021d578063e1f21c671461023957610100565b80631f29d2dc116100d35780631f29d2dc14610175578063367605ca146101915780636b42bf2f146101ad57806398dca5be146101c957610100565b80630198489214610105578063039d6f1914610121578063098f23661461013d57806315dacbea14610159575b600080fd5b61011f600480360381019061011a9190610ad7565b6102c5565b005b61013b60048036038101906101369190610b9f565b61033d565b005b61015760048036038101906101529190610c39565b6103b8565b005b610173600480360381019061016e9190610c79565b610437565b005b61018f600480360381019061018a9190610c39565b6104ac565b005b6101ab60048036038101906101a69190610d18565b61052b565b005b6101c760048036038101906101c29190610d6b565b61059d565b005b6101e360048036038101906101de9190610c79565b61061f565b005b6101ff60048036038101906101fa9190610ad7565b61068f565b005b61021b60048036038101906102169190610c39565b610707565b005b61023760048036038101906102329190610c79565b610786565b005b610253600480360381019061024e9190610d6b565b6107fb565b005b61026f600480360381019061026a9190610ad7565b61086d565b005b61028b60048036038101906102869190610c39565b6108e0565b005b6102a760048036038101906102a29190610dbe565b610964565b005b6102c360048036038101906102be9190610e11565b6109e6565b005b8073ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa158015610310573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906103399190610fad565b5050565b8573ffffffffffffffffffffffffffffffffffffffff1663b88d4fde86868686866040518663ffffffff1660e01b815260040161037e959493929190611061565b600060405180830381600087803b15801561039857600080fd5b505af11580156103ac573d6000803e3d6000fd5b50505050505050505050565b8173ffffffffffffffffffffffffffffffffffffffff1663081812fc826040518263ffffffff1660e01b81526004016103f191906110af565b602060405180830381865afa15801561040e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061043291906110df565b505050565b8373ffffffffffffffffffffffffffffffffffffffff166323b872dd8484846040518463ffffffff1660e01b81526004016104749392919061110c565b600060405180830381600087803b15801561048e57600080fd5b505af11580156104a2573d6000803e3d6000fd5b5050505050505050565b8173ffffffffffffffffffffffffffffffffffffffff16636352211e826040518263ffffffff1660e01b81526004016104e591906110af565b602060405180830381865afa158015610502573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061052691906110df565b505050565b8273ffffffffffffffffffffffffffffffffffffffff1663a22cb46583836040518363ffffffff1660e01b8152600401610566929190611152565b600060405180830381600087803b15801561058057600080fd5b505af1158015610594573d6000803e3d6000fd5b50505050505050565b8273ffffffffffffffffffffffffffffffffffffffff16632f745c5983836040518363ffffffff1660e01b81526004016105d892919061117b565b602060405180830381865afa1580156105f5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061991906111b9565b50505050565b8373ffffffffffffffffffffffffffffffffffffffff166323b872dd8484846040518463ffffffff1660e01b815260040161065c9392919061110c565b600060405180830381600087803b15801561067657600080fd5b505af115801561068a573d6000803e3d6000fd5b600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa1580156106da573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906107039190610fad565b5050565b8173ffffffffffffffffffffffffffffffffffffffff16634f6ccce7826040518263ffffffff1660e01b815260040161074091906110af565b602060405180830381865afa15801561075d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078191906111b9565b505050565b8373ffffffffffffffffffffffffffffffffffffffff166342842e0e8484846040518463ffffffff1660e01b81526004016107c39392919061110c565b600060405180830381600087803b1580156107dd57600080fd5b505af11580156107f1573d6000803e3d6000fd5b5050505050505050565b8273ffffffffffffffffffffffffffffffffffffffff1663095ea7b383836040518363ffffffff1660e01b815260040161083692919061117b565b600060405180830381600087803b15801561085057600080fd5b505af1158015610864573d6000803e3d6000fd5b50505050505050565b8073ffffffffffffffffffffffffffffffffffffffff166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108b8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108dc91906111b9565b5050565b8173ffffffffffffffffffffffffffffffffffffffff1663c87b56dd826040518263ffffffff1660e01b815260040161091991906110af565b600060405180830381865afa158015610936573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525081019061095f9190610fad565b505050565b8273ffffffffffffffffffffffffffffffffffffffff1663e985e9c583836040518363ffffffff1660e01b815260040161099f9291906111e6565b602060405180830381865afa1580156109bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109e09190611224565b50505050565b8173ffffffffffffffffffffffffffffffffffffffff166370a08231826040518263ffffffff1660e01b8152600401610a1f9190611251565b602060405180830381865afa158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6091906111b9565b505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610aa482610a79565b9050919050565b610ab481610a99565b8114610abf57600080fd5b50565b600081359050610ad181610aab565b92915050565b600060208284031215610aed57610aec610a6f565b5b6000610afb84828501610ac2565b91505092915050565b6000819050919050565b610b1781610b04565b8114610b2257600080fd5b50565b600081359050610b3481610b0e565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f840112610b5f57610b5e610b3a565b5b8235905067ffffffffffffffff811115610b7c57610b7b610b3f565b5b602083019150836001820283011115610b9857610b97610b44565b5b9250929050565b60008060008060008060a08789031215610bbc57610bbb610a6f565b5b6000610bca89828a01610ac2565b9650506020610bdb89828a01610ac2565b9550506040610bec89828a01610ac2565b9450506060610bfd89828a01610b25565b935050608087013567ffffffffffffffff811115610c1e57610c1d610a74565b5b610c2a89828a01610b49565b92509250509295509295509295565b60008060408385031215610c5057610c4f610a6f565b5b6000610c5e85828601610ac2565b9250506020610c6f85828601610b25565b9150509250929050565b60008060008060808587031215610c9357610c92610a6f565b5b6000610ca187828801610ac2565b9450506020610cb287828801610ac2565b9350506040610cc387828801610ac2565b9250506060610cd487828801610b25565b91505092959194509250565b60008115159050919050565b610cf581610ce0565b8114610d0057600080fd5b50565b600081359050610d1281610cec565b92915050565b600080600060608486031215610d3157610d30610a6f565b5b6000610d3f86828701610ac2565b9350506020610d5086828701610ac2565b9250506040610d6186828701610d03565b9150509250925092565b600080600060608486031215610d8457610d83610a6f565b5b6000610d9286828701610ac2565b9350506020610da386828701610ac2565b9250506040610db486828701610b25565b9150509250925092565b600080600060608486031215610dd757610dd6610a6f565b5b6000610de586828701610ac2565b9350506020610df686828701610ac2565b9250506040610e0786828701610ac2565b9150509250925092565b60008060408385031215610e2857610e27610a6f565b5b6000610e3685828601610ac2565b9250506020610e4785828601610ac2565b9150509250929050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610e9f82610e56565b810181811067ffffffffffffffff82111715610ebe57610ebd610e67565b5b80604052505050565b6000610ed1610a65565b9050610edd8282610e96565b919050565b600067ffffffffffffffff821115610efd57610efc610e67565b5b610f0682610e56565b9050602081019050919050565b60005b83811015610f31578082015181840152602081019050610f16565b60008484015250505050565b6000610f50610f4b84610ee2565b610ec7565b905082815260208101848484011115610f6c57610f6b610e51565b5b610f77848285610f13565b509392505050565b600082601f830112610f9457610f93610b3a565b5b8151610fa4848260208601610f3d565b91505092915050565b600060208284031215610fc357610fc2610a6f565b5b600082015167ffffffffffffffff811115610fe157610fe0610a74565b5b610fed84828501610f7f565b91505092915050565b610fff81610a99565b82525050565b61100e81610b04565b82525050565b600082825260208201905092915050565b82818337600083830152505050565b60006110408385611014565b935061104d838584611025565b61105683610e56565b840190509392505050565b60006080820190506110766000830188610ff6565b6110836020830187610ff6565b6110906040830186611005565b81810360608301526110a3818486611034565b90509695505050505050565b60006020820190506110c46000830184611005565b92915050565b6000815190506110d981610aab565b92915050565b6000602082840312156110f5576110f4610a6f565b5b6000611103848285016110ca565b91505092915050565b60006060820190506111216000830186610ff6565b61112e6020830185610ff6565b61113b6040830184611005565b949350505050565b61114c81610ce0565b82525050565b60006040820190506111676000830185610ff6565b6111746020830184611143565b9392505050565b60006040820190506111906000830185610ff6565b61119d6020830184611005565b9392505050565b6000815190506111b381610b0e565b92915050565b6000602082840312156111cf576111ce610a6f565b5b60006111dd848285016111a4565b91505092915050565b60006040820190506111fb6000830185610ff6565b6112086020830184610ff6565b9392505050565b60008151905061121e81610cec565b92915050565b60006020828403121561123a57611239610a6f565b5b60006112488482850161120f565b91505092915050565b60006020820190506112666000830184610ff6565b9291505056fea2646970667358221220f7f6276c7d750dc8d72a398d116c0e6e3839318e872e9c3e79fe9270408e001264736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.json
deleted file mode 100644
index 9be536d430e9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.json
+++ /dev/null
@@ -1,340 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getApproved",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "name": "isApprovedForAll",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "name",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ownerOf",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "safeTransferFromWithData",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "setApprovalForAll",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "symbol",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "index",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenByIndex",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "index",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenOfOwnerByIndex",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenURI",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "totalSupply",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromThenRevert",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.bin
deleted file mode 100644
index 853b50e44a4c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506115cb806100206000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c8063a86e35761161008c578063eac6f3fe11610066578063eac6f3fe146102bb578063eea4d2af146102eb578063f4a01e5b1461031b578063f7888aec1461034b576100ea565b8063a86e35761461022b578063e4dc2aa41461025b578063e9dc63751461028b576100ea565b80631f29d2dc116100c85780631f29d2dc1461017f57806343283d02146101af57806349146bde146101cb5780639b23d3d9146101fb576100ea565b806301984892146100ef57806311e1fc071461011f57806315dacbea1461014f575b600080fd5b61010960048036038101906101049190610eca565b61037b565b6040516101169190611350565b60405180910390f35b61013960048036038101906101349190610fb7565b610407565b6040516101469190611335565b60405180910390f35b61016960048036038101906101649190610fb7565b610523565b6040516101769190611335565b60405180910390f35b61019960048036038101906101949190611071565b610641565b6040516101a6919061124d565b60405180910390f35b6101c960048036038101906101c4919061101e565b6106d4565b005b6101e560048036038101906101e09190610f24565b610746565b6040516101f2919061131a565b60405180910390f35b61021560048036038101906102109190610fb7565b61085e565b6040516102229190611335565b60405180910390f35b61024560048036038101906102409190610eca565b61097c565b6040516102529190611350565b60405180910390f35b61027560048036038101906102709190610eca565b610a08565b6040516102829190611372565b60405180910390f35b6102a560048036038101906102a09190611071565b610a8f565b6040516102b29190611350565b60405180910390f35b6102d560048036038101906102d09190610fb7565b610b27565b6040516102e29190611335565b60405180910390f35b61030560048036038101906103009190610f64565b610c43565b60405161031291906112ff565b60405180910390f35b61033560048036038101906103309190610f24565b610cd9565b604051610342919061131a565b60405180910390f35b61036560048036038101906103609190610f24565b610d34565b6040516103729190611372565b60405180910390f35b60608173ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b815260040160006040518083038186803b1580156103c357600080fd5b505afa1580156103d7573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610400919061110b565b9050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016104449493929190611291565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104ae9190611236565b600060405180830381855af49150503d80600081146104e9576040519150601f19603f3d011682016040523d82523d6000602084013e6104ee565b606091505b5091509150816104ff576015610514565b8080602001905181019061051391906110de565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016105609493929190611291565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105ca9190611236565b6000604051808303816000865af19150503d8060008114610607576040519150601f19603f3d011682016040523d82523d6000602084013e61060c565b606091505b50915091508161061d576015610632565b8080602001905181019061063191906110de565b5b60030b92505050949350505050565b60008273ffffffffffffffffffffffffffffffffffffffff16636352211e836040518263ffffffff1660e01b815260040161067c9190611372565b60206040518083038186803b15801561069457600080fd5b505afa1580156106a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106cc9190610ef7565b905092915050565b8273ffffffffffffffffffffffffffffffffffffffff1663a22cb46583836040518363ffffffff1660e01b815260040161070f9291906112d6565b600060405180830381600087803b15801561072957600080fd5b505af115801561073d573d6000803e3d6000fd5b50505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161077f929190611268565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107e99190611236565b6000604051808303816000865af19150503d8060008114610826576040519150601f19603f3d011682016040523d82523d6000602084013e61082b565b606091505b50915091508161083c576015610851565b8080602001905181019061085091906110de565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b8888888860405160240161089b9493929190611291565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109059190611236565b6000604051808303816000865af19150503d8060008114610942576040519150601f19603f3d011682016040523d82523d6000602084013e610947565b606091505b50915091508161095857601561096d565b8080602001905181019061096c91906110de565b5b60030b92505050949350505050565b60608173ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b1580156109c457600080fd5b505afa1580156109d8573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610a01919061110b565b9050919050565b60008173ffffffffffffffffffffffffffffffffffffffff166318160ddd6040518163ffffffff1660e01b815260040160206040518083038186803b158015610a5057600080fd5b505afa158015610a64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a889190611154565b9050919050565b60608273ffffffffffffffffffffffffffffffffffffffff1663c87b56dd836040518263ffffffff1660e01b8152600401610aca9190611372565b60006040518083038186803b158015610ae257600080fd5b505afa158015610af6573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610b1f919061110b565b905092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401610b649493929190611291565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610bce9190611236565b600060405180830381855af49150503d8060008114610c09576040519150601f19603f3d011682016040523d82523d6000602084013e610c0e565b606091505b509150915081610c1f576015610c34565b80806020019051810190610c3391906110de565b5b60030b92505050949350505050565b60008373ffffffffffffffffffffffffffffffffffffffff1663e985e9c584846040518363ffffffff1660e01b8152600401610c80929190611268565b60206040518083038186803b158015610c9857600080fd5b505afa158015610cac573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cd091906110b1565b90509392505050565b6000610ce58383610746565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610d16919061131a565b60405180910390a1601660030b8114610d2e57600080fd5b92915050565b60008273ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b8152600401610d6f919061124d565b60206040518083038186803b158015610d8757600080fd5b505afa158015610d9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbf9190611154565b905092915050565b6000610dda610dd5846113b2565b61138d565b905082815260208101848484011115610df657610df5611519565b5b610e01848285611481565b509392505050565b600081359050610e1881611539565b92915050565b600081519050610e2d81611539565b92915050565b600081359050610e4281611550565b92915050565b600081519050610e5781611550565b92915050565b600081519050610e6c81611567565b92915050565b600082601f830112610e8757610e86611514565b5b8151610e97848260208601610dc7565b91505092915050565b600081359050610eaf8161157e565b92915050565b600081519050610ec48161157e565b92915050565b600060208284031215610ee057610edf611523565b5b6000610eee84828501610e09565b91505092915050565b600060208284031215610f0d57610f0c611523565b5b6000610f1b84828501610e1e565b91505092915050565b60008060408385031215610f3b57610f3a611523565b5b6000610f4985828601610e09565b9250506020610f5a85828601610e09565b9150509250929050565b600080600060608486031215610f7d57610f7c611523565b5b6000610f8b86828701610e09565b9350506020610f9c86828701610e09565b9250506040610fad86828701610e09565b9150509250925092565b60008060008060808587031215610fd157610fd0611523565b5b6000610fdf87828801610e09565b9450506020610ff087828801610e09565b935050604061100187828801610e09565b925050606061101287828801610ea0565b91505092959194509250565b60008060006060848603121561103757611036611523565b5b600061104586828701610e09565b935050602061105686828701610e09565b925050604061106786828701610e33565b9150509250925092565b6000806040838503121561108857611087611523565b5b600061109685828601610e09565b92505060206110a785828601610ea0565b9150509250929050565b6000602082840312156110c7576110c6611523565b5b60006110d584828501610e48565b91505092915050565b6000602082840312156110f4576110f3611523565b5b600061110284828501610e5d565b91505092915050565b60006020828403121561112157611120611523565b5b600082015167ffffffffffffffff81111561113f5761113e61151e565b5b61114b84828501610e72565b91505092915050565b60006020828403121561116a57611169611523565b5b600061117884828501610eb5565b91505092915050565b61118a81611415565b82525050565b61119981611427565b82525050565b60006111aa826113e3565b6111b481856113f9565b93506111c4818560208601611481565b80840191505092915050565b6111d981611433565b82525050565b6111e88161144a565b82525050565b60006111f9826113ee565b6112038185611404565b9350611213818560208601611481565b61121c81611528565b840191505092915050565b61123081611477565b82525050565b6000611242828461119f565b915081905092915050565b60006020820190506112626000830184611181565b92915050565b600060408201905061127d6000830185611181565b61128a6020830184611181565b9392505050565b60006080820190506112a66000830187611181565b6112b36020830186611181565b6112c06040830185611181565b6112cd6060830184611227565b95945050505050565b60006040820190506112eb6000830185611181565b6112f86020830184611190565b9392505050565b60006020820190506113146000830184611190565b92915050565b600060208201905061132f60008301846111d0565b92915050565b600060208201905061134a60008301846111df565b92915050565b6000602082019050818103600083015261136a81846111ee565b905092915050565b60006020820190506113876000830184611227565b92915050565b60006113976113a8565b90506113a382826114b4565b919050565b6000604051905090565b600067ffffffffffffffff8211156113cd576113cc6114e5565b5b6113d682611528565b9050602081019050919050565b600081519050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b600061142082611457565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b60005b8381101561149f578082015181840152602081019050611484565b838111156114ae576000848401525b50505050565b6114bd82611528565b810181811067ffffffffffffffff821117156114dc576114db6114e5565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b61154281611415565b811461154d57600080fd5b50565b61155981611427565b811461156457600080fd5b50565b6115708161143d565b811461157b57600080fd5b50565b61158781611477565b811461159257600080fd5b5056fea2646970667358221220070baef3dd4b85d10a9007ce8781fdba1093e96a3e2eedb2a7efedfbeb23315e64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.json
deleted file mode 100644
index f62b56856208..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.json
+++ /dev/null
@@ -1,380 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "name": "ResponseCode",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "name": "ercIsApprovedForAll",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "ercSetApprovalForAll",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ownerOf",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "symbol",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenURI",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.bin
deleted file mode 100644
index 93208b162ca0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b506200002a6301ffc9a760e01b620000c060201b60201c565b620000426380ac58cd60e01b620000c060201b60201c565b6200005a3360026200015f60201b6200074a1760201c565b620000723360036200015f60201b6200074a1760201c565b6200008a3360056200015f60201b6200074a1760201c565b620000a23360086200015f60201b6200074a1760201c565b620000ba33600d6200015f60201b6200074a1760201c565b620003c2565b63ffffffff60e01b817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620000f357600080fd5b6001600080837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060006101000a81548160ff02191690831515021790555050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200019957600080fd5b620001aa81620002bb60201b60201c565b15620001b557600080fd5b816001600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506200025b600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206200032d60201b6200088f1760201c565b808273ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a45050565b6000806001600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415915050919050565b600181600001600082825462000344919062000387565b9250508190555050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062000394826200034e565b9150620003a1836200034e565b9250828201905080821115620003bc57620003bb62000358565b5b92915050565b6114ca80620003d26000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80636352211e116100665780636352211e1461015757806370a0823114610187578063a22cb465146101b7578063b88d4fde146101d3578063e985e9c5146101ef5761009e565b806301ffc9a7146100a3578063081812fc146100d3578063095ea7b31461010357806323b872dd1461011f57806342842e0e1461013b575b600080fd5b6100bd60048036038101906100b89190610e14565b61021f565b6040516100ca9190610e5c565b60405180910390f35b6100ed60048036038101906100e89190610ead565b610286565b6040516100fa9190610f1b565b60405180910390f35b61011d60048036038101906101189190610f62565b6102d5565b005b61013960048036038101906101349190610fa2565b610415565b005b61015560048036038101906101509190610fa2565b610438565b005b610171600480360381019061016c9190610ead565b610458565b60405161017e9190610f1b565b60405180910390f35b6101a1600480360381019061019c9190610ff5565b6104d3565b6040516101ae9190611031565b60405180910390f35b6101d160048036038101906101cc9190611078565b61055b565b005b6101ed60048036038101906101e891906111fe565b610690565b005b61020960048036038101906102049190611281565b6106b6565b6040516102169190610e5c565b60405180910390f35b6000806000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060009054906101000a900460ff169050919050565b6000610291826108ae565b61029a57600080fd5b6002600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b60006102e082610458565b90508073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361031a57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061035a575061035981336106b6565b5b61036357600080fd5b826002600084815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a4505050565b61041f3382610920565b61042857600080fd5b6104338383836109b5565b505050565b61045383838360405180602001604052806000815250610690565b505050565b6000806001600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16036104ca57600080fd5b80915050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361050d57600080fd5b610554600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020610b77565b9050919050565b3373ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361059357600080fd5b80600460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31836040516106849190610e5c565b60405180910390a35050565b61069b848484610415565b6106a784848484610b85565b6106b057600080fd5b50505050565b6000600460008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361078357600080fd5b61078c816108ae565b1561079657600080fd5b816001600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061082f600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002061088f565b808273ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a45050565b60018160000160008282546108a491906112f0565b9250508190555050565b6000806001600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415915050919050565b60008061092c83610458565b90508073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16148061099b57508373ffffffffffffffffffffffffffffffffffffffff1661098384610286565b73ffffffffffffffffffffffffffffffffffffffff16145b806109ac57506109ab81856106b6565b5b91505092915050565b8273ffffffffffffffffffffffffffffffffffffffff166109d582610458565b73ffffffffffffffffffffffffffffffffffffffff16146109f557600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a2e57600080fd5b610a3781610c8d565b610a7e600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020610d4b565b610ac5600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002061088f565b816001600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4505050565b600081600001549050919050565b6000610ba68473ffffffffffffffffffffffffffffffffffffffff16610d6e565b610bb35760019050610c85565b60008473ffffffffffffffffffffffffffffffffffffffff1663150b7a02338887876040518563ffffffff1660e01b8152600401610bf494939291906113a3565b6020604051808303816000875af1158015610c13573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c379190611404565b905063150b7a0260e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149150505b949350505050565b600073ffffffffffffffffffffffffffffffffffffffff166002600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610d485760006002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50565b610d6360018260000154610d8190919063ffffffff16565b816000018190555050565b600080823b905060008111915050919050565b600082821115610d9457610d93611431565b5b8183610da09190611460565b905092915050565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b610df181610dbc565b8114610dfc57600080fd5b50565b600081359050610e0e81610de8565b92915050565b600060208284031215610e2a57610e29610db2565b5b6000610e3884828501610dff565b91505092915050565b60008115159050919050565b610e5681610e41565b82525050565b6000602082019050610e716000830184610e4d565b92915050565b6000819050919050565b610e8a81610e77565b8114610e9557600080fd5b50565b600081359050610ea781610e81565b92915050565b600060208284031215610ec357610ec2610db2565b5b6000610ed184828501610e98565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610f0582610eda565b9050919050565b610f1581610efa565b82525050565b6000602082019050610f306000830184610f0c565b92915050565b610f3f81610efa565b8114610f4a57600080fd5b50565b600081359050610f5c81610f36565b92915050565b60008060408385031215610f7957610f78610db2565b5b6000610f8785828601610f4d565b9250506020610f9885828601610e98565b9150509250929050565b600080600060608486031215610fbb57610fba610db2565b5b6000610fc986828701610f4d565b9350506020610fda86828701610f4d565b9250506040610feb86828701610e98565b9150509250925092565b60006020828403121561100b5761100a610db2565b5b600061101984828501610f4d565b91505092915050565b61102b81610e77565b82525050565b60006020820190506110466000830184611022565b92915050565b61105581610e41565b811461106057600080fd5b50565b6000813590506110728161104c565b92915050565b6000806040838503121561108f5761108e610db2565b5b600061109d85828601610f4d565b92505060206110ae85828601611063565b9150509250929050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61110b826110c2565b810181811067ffffffffffffffff8211171561112a576111296110d3565b5b80604052505050565b600061113d610da8565b90506111498282611102565b919050565b600067ffffffffffffffff821115611169576111686110d3565b5b611172826110c2565b9050602081019050919050565b82818337600083830152505050565b60006111a161119c8461114e565b611133565b9050828152602081018484840111156111bd576111bc6110bd565b5b6111c884828561117f565b509392505050565b600082601f8301126111e5576111e46110b8565b5b81356111f584826020860161118e565b91505092915050565b6000806000806080858703121561121857611217610db2565b5b600061122687828801610f4d565b945050602061123787828801610f4d565b935050604061124887828801610e98565b925050606085013567ffffffffffffffff81111561126957611268610db7565b5b611275878288016111d0565b91505092959194509250565b6000806040838503121561129857611297610db2565b5b60006112a685828601610f4d565b92505060206112b785828601610f4d565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006112fb82610e77565b915061130683610e77565b925082820190508082111561131e5761131d6112c1565b5b92915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561135e578082015181840152602081019050611343565b60008484015250505050565b600061137582611324565b61137f818561132f565b935061138f818560208601611340565b611398816110c2565b840191505092915050565b60006080820190506113b86000830187610f0c565b6113c56020830186610f0c565b6113d26040830185611022565b81810360608301526113e4818461136a565b905095945050505050565b6000815190506113fe81610de8565b92915050565b60006020828403121561141a57611419610db2565b5b6000611428848285016113ef565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fd5b600061146b82610e77565b915061147683610e77565b925082820390508181111561148e5761148d6112c1565b5b9291505056fea2646970667358221220a0c0eb3f0e07f069cf587634fd84cc074a52e73d12f7888b56da364c5903383964736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.json
deleted file mode 100644
index 999f4d9255b9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"_data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.bin
deleted file mode 100644
index 7e07fac8063e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610265806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806327e86d6e146100465780632e4c1d0214610064578063672829a61461006e575b600080fd5b61004e61008d565b60405161005b9190610154565b60405180910390f35b61006c6100a2565b005b610076610121565b604051610084929190610188565b60405180910390f35b600060014361009c91906101e0565b40905090565b7fdb7bcd08f1cb9a081d4a97aa8df2caca5caf3948df72cf63559bd93e2f44ffed426040516100d19190610214565b60405180910390a160004390506000814090507f4977e6b2d0d386b4fd3201b04b268b23d9e2ddcf6cab18a51ce2cc2978adc1318282604051610115929190610188565b60405180910390a15050565b60008060014361013191906101e0565b9150814090509091565b6000819050919050565b61014e8161013b565b82525050565b60006020820190506101696000830184610145565b92915050565b6000819050919050565b6101828161016f565b82525050565b600060408201905061019d6000830185610179565b6101aa6020830184610145565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006101eb8261016f565b91506101f68361016f565b925082821015610209576102086101b1565b5b828203905092915050565b60006020820190506102296000830184610179565b9291505056fea264697066735822122025ff2e06ffe45cdff1e0d5a99cb153547c981499635a06cf486ece1cca72f1d864736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.json b/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.json
deleted file mode 100644
index 5fa6c8dd8ecb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"blockNo","type":"uint256"},{"indexed":false,"internalType":"bytes32","name":"hash","type":"bytes32"}],"name":"Hash","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"now","type":"uint256"}],"name":"Time","type":"event"},{"inputs":[],"name":"getLastBlockHash","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getLastBlockMeta","outputs":[{"internalType":"uint256","name":"bNo","type":"uint256"},{"internalType":"bytes32","name":"bHash","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"logNow","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitEvent/EmitEvent.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmitEvent/EmitEvent.bin
deleted file mode 100644
index 112ed7445a02..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitEvent/EmitEvent.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506101c5806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806360fe47b11461003b5780636d4ce63c14610057575b600080fd5b610055600480360381019061005091906100d6565b610075565b005b61005f61007f565b60405161006c919061013c565b60405180910390f35b8060008190555050565b60007f983a71cbd12232447bd91ec4862c73ec6fb7f9501ffaf859ac4b7087522ac34e60076040516100b19190610121565b60405180910390a1600054905090565b6000813590506100d081610178565b92915050565b6000602082840312156100ec576100eb610173565b5b60006100fa848285016100c1565b91505092915050565b61010c81610161565b82525050565b61011b81610157565b82525050565b60006020820190506101366000830184610103565b92915050565b60006020820190506101516000830184610112565b92915050565b6000819050919050565b600061016c82610157565b9050919050565b600080fd5b61018181610157565b811461018c57600080fd5b5056fea2646970667358221220a8b1334558754a568c5010ed57bc22e5a52adf9a5b6eb46556695c54711a0b4b64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.bin
deleted file mode 100644
index 7ccec0155a63..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b5060a58061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80632e4c1d0214602d575b600080fd5b60336035565b005b604080513281523360208201527fd1a6b54229bce94ad50eab0f9def7823ec2da4287f791adc3ac68cccffbda65a910160405180910390a156fea2646970667358221220b1eb8a96424e936ee1f2017c3bc1f92fa4e78230db0ac0ae6bdd59fa57b43f8264736f6c634300080d0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.json b/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.json
deleted file mode 100644
index 3337ba417e81..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "origin",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      }
-    ],
-    "name": "Info",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "logNow",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.bin
deleted file mode 100644
index dafef90e0db8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212209867bc9e222f259b78850350268293a3fc9c399af7e1783d633416c9b29cbe1e64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.json
deleted file mode 100644
index cce2797b431d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyContract/EmptyContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyContract/EmptyContract.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.bin
deleted file mode 100644
index 7da228eff342..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220f98a434b8365b269a4d200c3ef4e01204d6e07d6ad16883f6eb7b946088695da64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.json b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.bin
deleted file mode 100644
index adec2d1b12fc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220cfa30cbfd2c26b6bc271b0fa0b1ac114b7fb9d0a242c0301f3774754eea912f464736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.json b/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.bin
deleted file mode 100644
index 000b3b2d62aa..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50611291806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063ba4916551461003b578063e5310b911461006b575b600080fd5b610055600480360381019061005091906102fc565b61009b565b60405161006291906103cc565b60405180910390f35b610085600480360381019061008091906102fc565b610124565b60405161009291906103cc565b60405180910390f35b60608273ffffffffffffffffffffffffffffffffffffffff1663c87b56dd836040518263ffffffff1660e01b81526004016100d691906103fd565b600060405180830381865afa1580156100f3573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525081019061011c919061053e565b905092915050565b606060008061016773ffffffffffffffffffffffffffffffffffffffff1663287e1da860e01b868660405160240161015d9291906105b2565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101c79190610617565b6000604051808303816000865af19150503d8060008114610204576040519150601f19603f3d011682016040523d82523d6000602084013e610209565b606091505b50915091508161021857600080fd5b6000808280602001905181019061022f91906111ff565b9150915060168260030b1461024357600080fd5b806080015194505050505092915050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061029382610268565b9050919050565b6102a381610288565b81146102ae57600080fd5b50565b6000813590506102c08161029a565b92915050565b6000819050919050565b6102d9816102c6565b81146102e457600080fd5b50565b6000813590506102f6816102d0565b92915050565b600080604083850312156103135761031261025e565b5b6000610321858286016102b1565b9250506020610332858286016102e7565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561037657808201518184015260208101905061035b565b60008484015250505050565b6000601f19601f8301169050919050565b600061039e8261033c565b6103a88185610347565b93506103b8818560208601610358565b6103c181610382565b840191505092915050565b600060208201905081810360008301526103e68184610393565b905092915050565b6103f7816102c6565b82525050565b600060208201905061041260008301846103ee565b92915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61045a82610382565b810181811067ffffffffffffffff8211171561047957610478610422565b5b80604052505050565b600061048c610254565b90506104988282610451565b919050565b600067ffffffffffffffff8211156104b8576104b7610422565b5b6104c182610382565b9050602081019050919050565b60006104e16104dc8461049d565b610482565b9050828152602081018484840111156104fd576104fc61041d565b5b610508848285610358565b509392505050565b600082601f83011261052557610524610418565b5b81516105358482602086016104ce565b91505092915050565b6000602082840312156105545761055361025e565b5b600082015167ffffffffffffffff81111561057257610571610263565b5b61057e84828501610510565b91505092915050565b61059081610288565b82525050565b60008160070b9050919050565b6105ac81610596565b82525050565b60006040820190506105c76000830185610587565b6105d460208301846105a3565b9392505050565b600081905092915050565b60006105f18261033c565b6105fb81856105db565b935061060b818560208601610358565b80840191505092915050565b600061062382846105e6565b915081905092915050565b60008160030b9050919050565b6106448161062e565b811461064f57600080fd5b50565b6000815190506106618161063b565b92915050565b600080fd5b600080fd5b6000815190506106808161029a565b92915050565b60008115159050919050565b61069b81610686565b81146106a657600080fd5b50565b6000815190506106b881610692565b92915050565b600063ffffffff82169050919050565b6106d7816106be565b81146106e257600080fd5b50565b6000815190506106f4816106ce565b92915050565b600067ffffffffffffffff82111561071557610714610422565b5b602082029050602081019050919050565b600080fd5b60008151905061073a816102d0565b92915050565b600067ffffffffffffffff82111561075b5761075a610422565b5b61076482610382565b9050602081019050919050565b600061078461077f84610740565b610482565b9050828152602081018484840111156107a05761079f61041d565b5b6107ab848285610358565b509392505050565b600082601f8301126107c8576107c7610418565b5b81516107d8848260208601610771565b91505092915050565b600060a082840312156107f7576107f6610667565b5b61080160a0610482565b90506000610811848285016106a9565b600083015250602061082584828501610671565b602083015250604082015167ffffffffffffffff8111156108495761084861066c565b5b610855848285016107b3565b604083015250606082015167ffffffffffffffff8111156108795761087861066c565b5b610885848285016107b3565b606083015250608061089984828501610671565b60808301525092915050565b6000604082840312156108bb576108ba610667565b5b6108c56040610482565b905060006108d58482850161072b565b600083015250602082015167ffffffffffffffff8111156108f9576108f861066c565b5b610905848285016107e1565b60208301525092915050565b600061092461091f846106fa565b610482565b9050808382526020820190506020840283018581111561094757610946610726565b5b835b8181101561098e57805167ffffffffffffffff81111561096c5761096b610418565b5b80860161097989826108a5565b85526020850194505050602081019050610949565b5050509392505050565b600082601f8301126109ad576109ac610418565b5b81516109bd848260208601610911565b91505092915050565b6000606082840312156109dc576109db610667565b5b6109e66060610482565b905060006109f6848285016106e5565b6000830152506020610a0a84828501610671565b6020830152506040610a1e848285016106e5565b60408301525092915050565b60006101608284031215610a4157610a40610667565b5b610a4c610120610482565b9050600082015167ffffffffffffffff811115610a6c57610a6b61066c565b5b610a7884828501610510565b600083015250602082015167ffffffffffffffff811115610a9c57610a9b61066c565b5b610aa884828501610510565b6020830152506040610abc84828501610671565b604083015250606082015167ffffffffffffffff811115610ae057610adf61066c565b5b610aec84828501610510565b6060830152506080610b00848285016106a9565b60808301525060a0610b14848285016106e5565b60a08301525060c0610b28848285016106a9565b60c08301525060e082015167ffffffffffffffff811115610b4c57610b4b61066c565b5b610b5884828501610998565b60e083015250610100610b6d848285016109c6565b6101008301525092915050565b610b8381610596565b8114610b8e57600080fd5b50565b600081519050610ba081610b7a565b92915050565b600067ffffffffffffffff821115610bc157610bc0610422565b5b602082029050602081019050919050565b600060a08284031215610be857610be7610667565b5b610bf260a0610482565b90506000610c02848285016106e5565b6000830152506020610c1684828501610671565b6020830152506040610c2a848285016106a9565b6040830152506060610c3e848285016106a9565b6060830152506080610c5284828501610671565b60808301525092915050565b6000610c71610c6c84610ba6565b610482565b90508083825260208201905060a08402830185811115610c9457610c93610726565b5b835b81811015610cbd5780610ca98882610bd2565b84526020840193505060a081019050610c96565b5050509392505050565b600082601f830112610cdc57610cdb610418565b5b8151610cec848260208601610c5e565b91505092915050565b600067ffffffffffffffff821115610d1057610d0f610422565b5b602082029050602081019050919050565b600060c08284031215610d3757610d36610667565b5b610d4160c0610482565b90506000610d51848285016106e5565b6000830152506020610d65848285016106e5565b6020830152506040610d79848285016106e5565b6040830152506060610d8d848285016106e5565b6060830152506080610da1848285016106a9565b60808301525060a0610db584828501610671565b60a08301525092915050565b6000610dd4610dcf84610cf5565b610482565b90508083825260208201905060c08402830185811115610df757610df6610726565b5b835b81811015610e205780610e0c8882610d21565b84526020840193505060c081019050610df9565b5050509392505050565b600082601f830112610e3f57610e3e610418565b5b8151610e4f848260208601610dc1565b91505092915050565b600067ffffffffffffffff821115610e7357610e72610422565b5b602082029050602081019050919050565b600060c08284031215610e9a57610e99610667565b5b610ea460c0610482565b90506000610eb4848285016106e5565b6000830152506020610ec8848285016106e5565b6020830152506040610edc848285016106e5565b6040830152506060610ef084828501610671565b6060830152506080610f04848285016106a9565b60808301525060a0610f1884828501610671565b60a08301525092915050565b6000610f37610f3284610e58565b610482565b90508083825260208201905060c08402830185811115610f5a57610f59610726565b5b835b81811015610f835780610f6f8882610e84565b84526020840193505060c081019050610f5c565b5050509392505050565b600082601f830112610fa257610fa1610418565b5b8151610fb2848260208601610f24565b91505092915050565b60006101208284031215610fd257610fd1610667565b5b610fdd610120610482565b9050600082015167ffffffffffffffff811115610ffd57610ffc61066c565b5b61100984828501610a2a565b600083015250602061101d84828501610b91565b6020830152506040611031848285016106a9565b6040830152506060611045848285016106a9565b6060830152506080611059848285016106a9565b60808301525060a082015167ffffffffffffffff81111561107d5761107c61066c565b5b61108984828501610cc7565b60a08301525060c082015167ffffffffffffffff8111156110ad576110ac61066c565b5b6110b984828501610e2a565b60c08301525060e082015167ffffffffffffffff8111156110dd576110dc61066c565b5b6110e984828501610f8d565b60e08301525061010082015167ffffffffffffffff81111561110e5761110d61066c565b5b61111a84828501610510565b6101008301525092915050565b600060c0828403121561113d5761113c610667565b5b61114760c0610482565b9050600082015167ffffffffffffffff8111156111675761116661066c565b5b61117384828501610fbb565b600083015250602061118784828501610b91565b602083015250604061119b84828501610671565b60408301525060606111af84828501610b91565b606083015250608082015167ffffffffffffffff8111156111d3576111d261066c565b5b6111df848285016107b3565b60808301525060a06111f384828501610671565b60a08301525092915050565b600080604083850312156112165761121561025e565b5b600061122485828601610652565b925050602083015167ffffffffffffffff81111561124557611244610263565b5b61125185828601611127565b915050925092905056fea26469706673582212200bb5b89d24ae62237ba2b512f74a8957dcbe47095a06b52a108b8a5ba2d9797b64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.json
deleted file mode 100644
index d8db29471eab..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"canGetMetadataViaERC","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"canGetMetadataViaHTS","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.bin
deleted file mode 100644
index 6fddea389549..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561000f575f80fd5b5060405161041938038061041983398101604081905261002e91610035565b5f5561004c565b5f60208284031215610045575f80fd5b5051919050565b6103c0806100595f395ff3fe60806040526004361061003e575f3560e01c806303b636e6146100425780633f39929f1461004c57806389dea1d01461005f578063bff4f54f14610067575b5f80fd5b61004a610081565b005b61004a61005a366004610307565b61010c565b61004a610118565b61006f610149565b60405190815260200160405180910390f35b60408051600481526024810182526020810180516001600160e01b031663bff4f54f60e01b17905290515f918291610168916100bc9161031e565b5f604051808303815f865af19150503d805f81146100f5576040519150601f19603f3d011682016040523d82523d5f602084013e6100fa565b606091505b509150915081610108575f80fd5b5050565b61011581610158565b50565b5f80549061012a6305f5e1008361034a565b90505f6101368261020d565b905080341015610144575f80fd5b505050565b5f610153346102dd565b905090565b5f806101686001600160a01b0316346343a8822960e01b8560405160240161018291815260200190565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516101c0919061031e565b5f6040518083038185875af1925050503d805f81146101fa576040519150601f19603f3d011682016040523d82523d5f602084013e6101ff565b606091505b509150915081610144575f80fd5b5f805f6101686001600160a01b0316632e3cff6a60e01b8560405160240161023791815260200190565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610275919061031e565b5f604051808303815f865af19150503d805f81146102ae576040519150601f19603f3d011682016040523d82523d5f602084013e6102b3565b606091505b5091509150816102c1575f80fd5b808060200190518101906102d59190610373565b949350505050565b5f805f6101686001600160a01b03166343a8822960e01b8560405160240161023791815260200190565b5f60208284031215610317575f80fd5b5035919050565b5f82515f5b8181101561033d5760208186018101518583015201610323565b505f920191825250919050565b808202811582820484141761036d57634e487b7160e01b5f52601160045260245ffd5b92915050565b5f60208284031215610383575f80fd5b505191905056fea2646970667358221220fbb1848818142a7e5b6f1a743d4ea51e969fba3350e33fa6541dc8fe34b198a264736f6c63430008180033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.json
deleted file mode 100644
index 861e42ba3a60..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_toll",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "approxUsdValue",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "tinycents",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "callWithValue",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "gatedAccess",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "invalidCall",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.bin
deleted file mode 100644
index e41cc69056ee..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061022a806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630cb8f74e146100465780635d0072811461009e578063c951c2ce146100f6575b600080fd5b6100886004803603602081101561005c57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506101b3565b6040518082815260200191505060405180910390f35b6100e0600480360360208110156100b457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506101be565b6040518082815260200191505060405180910390f35b6101386004803603602081101561010c57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506101c9565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561017857808201518184015260208101905061015d565b50505050905090810190601f1680156101a55780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6000813b9050919050565b6000813f9050919050565b6060813b6040519150601f19601f602083010116820160405280825280600060208401853c8060208301f3fea265627a7a723158205d6ffe77c2ac410823c9f55cd9622257e1869380d3c5f2781e7b9f8f8671f9de64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.json
deleted file mode 100644
index 6ca5f3fea176..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "codeCopyOf",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "code",
-        "type": "bytes"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "hashOf",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "hash",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "sizeOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "size",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.bin
deleted file mode 100644
index 88c2ae58186d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610564806100206000396000f30060806040526004361061006d576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806329b4a7a91461007257806330f3f78d146100895780634600028f146100a057806357465311146100b757806399eef055146100ce575b600080fd5b34801561007e57600080fd5b506100876100e5565b005b34801561009557600080fd5b5061009e61011a565b005b3480156100ac57600080fd5b506100b5610152565b005b3480156100c357600080fd5b506100cc61017a565b005b3480156100da57600080fd5b506100e36101a2565b005b6100ed6101da565b604051809103906000f080158015610109573d6000803e3d6000fd5b50506000151561011857600080fd5b565b60006101246101e9565b8082151515158152602001915050604051809103906000f08015801561014e573d6000803e3d6000fd5b5050565b61015a6101da565b604051809103906000f080158015610176573d6000803e3d6000fd5b5050565b6101826101f9565b604051809103906000f08015801561019e573d6000803e3d6000fd5b5050565b60016101ac6101e9565b8082151515158152602001915050604051809103906000f0801580156101d6573d6000803e3d6000fd5b5050565b60405160c18061020983390190565b604051610211806102ca83390190565b604051605e806104db83390190560060806040526001600055348015601457600080fd5b50609e806100236000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630263ad6e146044575b600080fd5b348015604f57600080fd5b506056606c565b6040518082815260200191505060405180910390f35b600054815600a165627a7a723058201c9ed9349654a5da3fdb8179de2a55a72004a208c54d1b6f631b61a677a2ded70029608060405234801561001057600080fd5b5060405160208061021183398101806040528101908080519060200190929190505050801561006457610041610091565b604051809103906000f08015801561005d573d6000803e3d6000fd5b505061008b565b61006c6100a0565b604051809103906000f080158015610088573d6000803e3d6000fd5b50505b506100af565b604051605e806100f283390190565b60405160c18061015083390190565b6035806100bd6000396000f3006080604052600080fd00a165627a7a72305820158da09b2d20d244b9a649f18f0c971f88bf17cf5ead70dc5813e8d3f9e60ffd00296080604052348015600f57600080fd5b5060001515601c57600080fd5b60358060296000396000f3006080604052600080fd00a165627a7a72305820318d1796eb4182679650ed1f369e8e5bcdac3e654e42de63511c5184cbb4736c002960806040526001600055348015601457600080fd5b50609e806100236000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630263ad6e146044575b600080fd5b348015604f57600080fd5b506056606c565b6040518082815260200191505060405180910390f35b600054815600a165627a7a723058201c9ed9349654a5da3fdb8179de2a55a72004a208c54d1b6f631b61a677a2ded700296080604052348015600f57600080fd5b5060001515601c57600080fd5b60358060296000396000f3006080604052600080fd00a165627a7a72305820318d1796eb4182679650ed1f369e8e5bcdac3e654e42de63511c5184cbb4736c0029a165627a7a723058205346eab818f04c4d416fa10b7fcf09c7413bc0f4c3deb16642c8ad3210582bf90029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.json
deleted file mode 100644
index 1eb01d7137b0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.json
+++ /dev/null
@@ -1,45 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "failureAfterDeploy",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "deploymentSuccess",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "deploymentFailure",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  { "constant": false,
-    "inputs": [],
-    "name": "stackedDeploymentSuccess",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  { "constant": false,
-    "inputs": [],
-    "name": "stackedDeploymentFailure",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.bin
deleted file mode 100644
index 2ee010df0fb1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526000604051610012906100c0565b604051809103906000f08015801561002e573d6000803e3d6000fd5b5090508060008060028110610046576100456100cc565b5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f8f5fd6a78ac856dc2d622ab0db626cf919c1911133d4b038171534ea477e5d156040516100b290610158565b60405180910390a150610178565b60f7806107fc83390190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082825260208201905092915050565b7f43726561746564206669727374206368696c6420636f6e747261637400000000600082015250565b6000610142601c836100fb565b915061014d8261010c565b602082019050919050565b6000602082019050818103600083015261017181610135565b9050919050565b610675806101876000396000f3fe60806040526004361061004e5760003560e01c80630419eca51461005a5780635e01eb5a146100975780636896fabf146100c25780637998a1c4146100ed5780638070450f1461011857610055565b3661005557005b600080fd5b34801561006657600080fd5b50610081600480360381019061007c9190610393565b610143565b60405161008e9190610401565b60405180910390f35b3480156100a357600080fd5b506100ac6102bc565b6040516100b99190610401565b60405180910390f35b3480156100ce57600080fd5b506100d76102c4565b6040516100e4919061042b565b60405180910390f35b3480156100f957600080fd5b50610102610318565b60405161010f9190610481565b60405180910390f35b34801561012457600080fd5b5061012d610343565b60405161013a919061042b565b60405180910390f35b60006040516101519061034c565b604051809103906000f08015801561016d573d6000803e3d6000fd5b5060006001600281106101835761018261049c565b5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f8f5fd6a78ac856dc2d622ab0db626cf919c1911133d4b038171534ea477e5d156040516101ef90610528565b60405180910390a1600082111561027e5760006001600281106102155761021461049c565b5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f1935050505015801561027c573d6000803e3d6000fd5b505b60006001600281106102935761029261049c565b5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600033905090565b6000806001600281106102da576102d961049c565b5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1631905090565b600080357fffffffff0000000000000000000000000000000000000000000000000000000016905090565b60006004905090565b60f78061054983390190565b600080fd5b6000819050919050565b6103708161035d565b811461037b57600080fd5b50565b60008135905061038d81610367565b92915050565b6000602082840312156103a9576103a8610358565b5b60006103b78482850161037e565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103eb826103c0565b9050919050565b6103fb816103e0565b82525050565b600060208201905061041660008301846103f2565b92915050565b6104258161035d565b82525050565b6000602082019050610440600083018461041c565b92915050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61047b81610446565b82525050565b60006020820190506104966000830184610472565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082825260208201905092915050565b7f43726561746564207365636f6e64206368696c6420636f6e7472616374000000600082015250565b6000610512601d836104cb565b915061051d826104dc565b602082019050919050565b6000602082019050818103600083015261054181610505565b905091905056fe608060405234801561001057600080fd5b5060d88061001f6000396000f3fe608060405236606d573073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef34604051606391906089565b60405180910390a3005b600080fd5b6000819050919050565b6083816072565b82525050565b6000602082019050609c6000830184607c565b9291505056fea26469706673582212209febbca244b85467ec8658fcc2443156dd4b165f87653eba6fb8fdadea7bd87c64736f6c63430008110033a26469706673582212205a56819dbd78836ddef02b5bb1a2194aaa509748da9ee8d1b61676fd4e82349164736f6c63430008110033608060405234801561001057600080fd5b5060d88061001f6000396000f3fe608060405236606d573073ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef34604051606391906089565b60405180910390a3005b600080fd5b6000819050919050565b6083816072565b82525050565b6000602082019050609c6000830184607c565b9291505056fea26469706673582212209febbca244b85467ec8658fcc2443156dd4b165f87653eba6fb8fdadea7bd87c64736f6c63430008110033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.json
deleted file mode 100644
index a93a77f8b743..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.json
+++ /dev/null
@@ -1,95 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "message",
-        "type": "string"
-      }
-    ],
-    "name": "ParentActivityLog",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "createChild",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getAccountBalance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getSender",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "identifier",
-    "outputs": [
-      {
-        "internalType": "bytes4",
-        "name": "",
-        "type": "bytes4"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "multiplySimpleNumbers",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "receive"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.bin
deleted file mode 100644
index e68a18018f62..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610375806100206000396000f3fe60806040526004361061001e5760003560e01c80633f5534f214610023575b600080fd5b61002b61002d565b005b600060405161003b906100ff565b604051809103906000f080158015610057573d6000803e3d6000fd5b5090507f7b4b5576882318f3025ede3b4525a692b9a9792674c6bd0f82ce62845374a92181604051610089919061012a565b60405180910390a18073ffffffffffffffffffffffffffffffffffffffff1663b9caebf4336040518263ffffffff1660e01b81526004016100ca9190610145565b600060405180830381600087803b1580156100e457600080fd5b505af11580156100f8573d6000803e3d6000fd5b5050505050565b610177806101c983390190565b61011581610192565b82525050565b61012481610160565b82525050565b600060208201905061013f600083018461011b565b92915050565b600060208201905061015a600083018461010c565b92915050565b600061016b82610172565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061019d826101a4565b9050919050565b60006101af826101b6565b9050919050565b60006101c182610172565b905091905056fe608060405234801561001057600080fd5b50610157806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063b9caebf414610030575b600080fd5b61004a600480360381019061004591906100a6565b61004c565b005b7fae37da32bc5e18464ff831e18b6084770c6bf6c0c76a9cb82d3c76e87b4a72da60405160405180910390a18073ffffffffffffffffffffffffffffffffffffffff16ff5b6000813590506100a08161010a565b92915050565b6000602082840312156100bc576100bb610105565b5b60006100ca84828501610091565b91505092915050565b60006100de826100e5565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600080fd5b610113816100d3565b811461011e57600080fd5b5056fea264697066735822122032ae68dc25b1dfd9591fbb5d08fc9eac4a61aee827353546af3d696209c1616864736f6c63430008070033a2646970667358221220f112707c305e7c03c1f15f270136ab5dc00fd00ae6be140db9874c8eb1dc48a464736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.json
deleted file mode 100644
index 0e1b12ce1d13..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "ChildCreated",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "createAndDeleteChild",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.bin
deleted file mode 100644
index f9e7fa1bec2f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600060405160109060aa565b604051809103906000f080158015602b573d6000803e3d6000fd5b5090507f7b4b5576882318f3025ede3b4525a692b9a9792674c6bd0f82ce62845374a92181604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a13373ffffffffffffffffffffffffffffffffffffffff16ff5b605b806100b78339019056fe6080604052348015600f57600080fd5b50603e80601d6000396000f3fe6080604052600080fdfea265627a7a72315820a7d84f8b7106312075cf7a9a8382694c7781f19d7111ddad4117866d3c355f7464736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.json
deleted file mode 100644
index 616c893de977..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "ChildCreated",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.bin
deleted file mode 100644
index 4edaaa632542..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526101676000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555034801561005257600080fd5b50610405806100626000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80637a50c4c914610030575b600080fd5b61004a60048036038101906100459190610263565b610060565b604051610057919061032b565b60405180910390f35b606060008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16846040516100aa9190610389565b6000604051808303816000865af19150503d80600081146100e7576040519150601f19603f3d011682016040523d82523d6000602084013e6100ec565b606091505b5091509150816100ff576100fe6103a0565b5b8092505050919050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61017082610127565b810181811067ffffffffffffffff8211171561018f5761018e610138565b5b80604052505050565b60006101a2610109565b90506101ae8282610167565b919050565b600067ffffffffffffffff8211156101ce576101cd610138565b5b6101d782610127565b9050602081019050919050565b82818337600083830152505050565b6000610206610201846101b3565b610198565b90508281526020810184848401111561022257610221610122565b5b61022d8482856101e4565b509392505050565b600082601f83011261024a5761024961011d565b5b813561025a8482602086016101f3565b91505092915050565b60006020828403121561027957610278610113565b5b600082013567ffffffffffffffff81111561029757610296610118565b5b6102a384828501610235565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156102e65780820151818401526020810190506102cb565b60008484015250505050565b60006102fd826102ac565b61030781856102b7565b93506103178185602086016102c8565b61032081610127565b840191505092915050565b6000602082019050818103600083015261034581846102f2565b905092915050565b600081905092915050565b6000610363826102ac565b61036d818561034d565b935061037d8185602086016102c8565b80840191505092915050565b60006103958284610358565b915081905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fdfea2646970667358221220c07623a2ecdaf0057b88606a8abf2dbbe543ea535c31daf544f375b18bfc393964736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.json
deleted file mode 100644
index 333c883b9d23..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"bytes","name":"data","type":"bytes"}],"name":"makeClassicCall","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.bin
deleted file mode 100644
index 4c4f2070c0ca..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061087b806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80637c41ad2c146100465780638a34ffa214610076578063c3283f4d14610092575b600080fd5b610060600480360381019061005b9190610504565b6100ae565b60405161006d919061054a565b60405180910390f35b610090600480360381019061008b9190610565565b6101c3565b005b6100ac60048036038101906100a79190610565565b610220565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100e591906105c7565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161014f9190610653565b6000604051808303816000865af19150503d806000811461018c576040519150601f19603f3d011682016040523d82523d6000602084013e610191565b606091505b5091509150816101a25760156101b7565b808060200190518101906101b691906106a3565b5b60030b92505050919050565b60006101d28484846064610383565b9050601660030b811461021a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102119061072d565b60405180910390fd5b50505050565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b868686606460405160240161025c949392919061079f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102c69190610653565b6000604051808303816000865af19150503d8060008114610303576040519150601f19603f3d011682016040523d82523d6000602084013e610308565b606091505b509150915060008261031b576015610330565b8180602001905181019061032f91906106a3565b5b60030b9050601660030b811461037b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103729061072d565b60405180910390fd5b505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b888888886040516024016103c09493929190610800565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161042a9190610653565b6000604051808303816000865af19150503d8060008114610467576040519150601f19603f3d011682016040523d82523d6000602084013e61046c565b606091505b50915091508161047d576015610492565b8080602001905181019061049191906106a3565b5b60030b92505050949350505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006104d1826104a6565b9050919050565b6104e1816104c6565b81146104ec57600080fd5b50565b6000813590506104fe816104d8565b92915050565b60006020828403121561051a576105196104a1565b5b6000610528848285016104ef565b91505092915050565b6000819050919050565b61054481610531565b82525050565b600060208201905061055f600083018461053b565b92915050565b60008060006060848603121561057e5761057d6104a1565b5b600061058c868287016104ef565b935050602061059d868287016104ef565b92505060406105ae868287016104ef565b9150509250925092565b6105c1816104c6565b82525050565b60006020820190506105dc60008301846105b8565b92915050565b600081519050919050565b600081905092915050565b60005b838110156106165780820151818401526020810190506105fb565b60008484015250505050565b600061062d826105e2565b61063781856105ed565b93506106478185602086016105f8565b80840191505092915050565b600061065f8284610622565b915081905092915050565b60008160030b9050919050565b6106808161066a565b811461068b57600080fd5b50565b60008151905061069d81610677565b92915050565b6000602082840312156106b9576106b86104a1565b5b60006106c78482850161068e565b91505092915050565b600082825260208201905092915050565b7f5472616e73666572206f6620746f6b656e73206661696c656400000000000000600082015250565b60006107176019836106d0565b9150610722826106e1565b602082019050919050565b600060208201905081810360008301526107468161070a565b9050919050565b6000819050919050565b600060ff82169050919050565b6000819050919050565b600061078961078461077f8461074d565b610764565b610757565b9050919050565b6107998161076e565b82525050565b60006080820190506107b460008301876105b8565b6107c160208301866105b8565b6107ce60408301856105b8565b6107db6060830184610790565b95945050505050565b60008160070b9050919050565b6107fa816107e4565b82525050565b600060808201905061081560008301876105b8565b61082260208301866105b8565b61082f60408301856105b8565b61083c60608301846107f1565b9594505050505056fea26469706673582212205c34d8b7388521607ecd48ee7c7b3b91bfda86c43f8a47c161a67d0d292a02ab64736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.json
deleted file mode 100644
index a68d7d135a57..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      }
-    ],
-    "name": "distributeFees",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      }
-    ],
-    "name": "distributeFeesStaticCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.bin
deleted file mode 100644
index 4f13fa5e30b5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122001677e1d2c0f31953acb133ae6a69416ff6ca8718ba61ae7fb8c3f870a863bee64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.bin
deleted file mode 100644
index 83701052de05..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516103be3803806103be8339818101604052602081101561003357600080fd5b81019080805190602001909291905050508063ffffffff166040519080825280602002602001820160405280156100795781602001602082028038833980820191505090505b506000908051906020019061008f929190610096565b5050610108565b8280548282559060005260206000209081019282156100d2579160200282015b828111156100d15782518255916020019190600101906100b6565b5b5090506100df91906100e3565b5090565b61010591905b808211156101015760008160009055506001016100e9565b5090565b90565b6102a7806101176000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634ff287db1461003b57806393f0b8d314610103575b600080fd5b6101016004803603604081101561005157600080fd5b810190808035906020019064010000000081111561006e57600080fd5b82018360208201111561008057600080fd5b803590602001918460208302840111640100000000831117156100a257600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290803563ffffffff169060200190929190505050610162565b005b61010b6101db565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561014e578082015181840152602081019050610133565b505050509050019250505060405180910390f35b600061016d82610233565b905060008090505b83518163ffffffff1610156101d557816000858363ffffffff168151811061019957fe5b602002602001015163ffffffff16815481106101b157fe5b90600052602060002001600082825401925050819055508080600101915050610175565b50505050565b6060600080548060200260200160405190810160405280929190818152602001828054801561022957602002820191906000526020600020905b815481526020019060010190808311610215575b5050505050905090565b600060018263ffffffff1611610251578163ffffffff16905061026d565b61025d60028303610233565b61026960018403610233565b0190505b91905056fea265627a7a7231582028ef0a5a6437a979913149f56d5dccf087c6927d27eeeffdb898f060aee02b8364736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.json
deleted file mode 100644
index fe7c5536720b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "numSlots",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint32[]",
-        "name": "at",
-        "type": "uint32[]"
-      },
-      {
-        "internalType": "uint32",
-        "name": "n",
-        "type": "uint32"
-      }
-    ],
-    "name": "addNthFib",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "currentSlots",
-    "outputs": [
-      {
-        "internalType": "uint256[]",
-        "name": "",
-        "type": "uint256[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.bin
deleted file mode 100644
index 739781f92bac..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506106f1806100206000396000f3fe6080604052600436106100295760003560e01c8063cad372a71461002e578063e5d5759f1461006b575b600080fd5b34801561003a57600080fd5b5061005560048036038101906100509190610212565b610087565b6040516100629190610280565b60405180910390f35b61008560048036038101906100809190610212565b61013f565b005b6000806040518060200161009a906101ca565b6020820181038252601f19601f820116604052509050600081306040516020016100c49190610280565b6040516020818303038152906040526040516020016100e492919061030c565b6040516020818303038152906040529050600060ff60f81b308684805190602001206040516020016101199493929190610411565b6040516020818303038152906040528051906020012090508060001c9350505050919050565b600060405180602001610151906101ca565b6020820181038252601f19601f8201166040525090506000813060405160200161017b9190610280565b60405160208183030381529060405260405160200161019b92919061030c565b604051602081830303815290604052905060008382516020840134f59050803b6101c457600080fd5b50505050565b61025c8061046083390190565b600080fd5b6000819050919050565b6101ef816101dc565b81146101fa57600080fd5b50565b60008135905061020c816101e6565b92915050565b600060208284031215610228576102276101d7565b5b6000610236848285016101fd565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061026a8261023f565b9050919050565b61027a8161025f565b82525050565b60006020820190506102956000830184610271565b92915050565b600081519050919050565b600081905092915050565b60005b838110156102cf5780820151818401526020810190506102b4565b60008484015250505050565b60006102e68261029b565b6102f081856102a6565b93506103008185602086016102b1565b80840191505092915050565b600061031882856102db565b915061032482846102db565b91508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b61037761037282610330565b61035c565b82525050565b60008160601b9050919050565b60006103958261037d565b9050919050565b60006103a78261038a565b9050919050565b6103bf6103ba8261025f565b61039c565b82525050565b6000819050919050565b6103e06103db826101dc565b6103c5565b82525050565b6000819050919050565b6000819050919050565b61040b610406826103e6565b6103f0565b82525050565b600061041d8287610366565b60018201915061042d82866103ae565b60148201915061043d82856103cf565b60208201915061044d82846103fa565b6020820191508190509594505050505056fe608060405260405161025c38038061025c833981810160405281019061002591906100ce565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506100fb565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061009b82610070565b9050919050565b6100ab81610090565b81146100b657600080fd5b50565b6000815190506100c8816100a2565b92915050565b6000602082840312156100e4576100e361006b565b5b60006100f2848285016100b9565b91505092915050565b6101528061010a6000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806360f96a8f1461003b578063737bc3c914610059575b600080fd5b610043610063565b6040516100509190610101565b60405180910390f35b610061610087565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100eb826100c0565b9050919050565b6100fb816100e0565b82525050565b600060208201905061011660008301846100f2565b9291505056fea2646970667358221220ca5dd437956c7aaeca727d97b81ea0cc26017cd77c364bdbb23caa8e27b6608664736f6c63430008100033a264697066735822122049486113dabd2cde847730dc90df4e62ee9fa0e979f13e88a3c676dbe4081ebb64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.json
deleted file mode 100644
index 732ad30d71d2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"uint256","name":"salt","type":"uint256"}],"name":"computeChildAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"salt","type":"uint256"}],"name":"deployDeterministicChild","outputs":[],"stateMutability":"payable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.bin
deleted file mode 100644
index a26779ca7d9c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610883806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806305ac4b4c14610046578063565ca6fa146100aa578063752a4bb714610124575b600080fd5b6100a86004803603604081101561005c57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610188565b005b61010c600480360360408110156100c057600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610217565b60405180821515815260200191505060405180910390f35b6101866004803603604081101561013a57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102b1565b005b60006101948383610340565b60070b9050601660030b8114610212576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e20756e667265657a65206661696c6564210000000000000000000081525060200191505060405180910390fd5b505050565b600080600061022685856104e7565b915060070b9150601660030b82146102a6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e20697346726f7a656e206661696c6564210000000000000000000081525060200191505060405180910390fd5b809250505092915050565b60006102bd83836106a6565b60070b9050601660030b811461033b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f546f6b656e20667265657a65206661696c65642100000000000000000000000081525060200191505060405180910390fd5b505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff166352f9138760e01b8686604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061043b5780518252602082019150602081019050602083039250610418565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461049d576040519150601f19603f3d011682016040523d82523d6000602084013e6104a2565b606091505b5091509150816104b35760156104da565b8080602001905160208110156104c857600080fd5b81019080805190602001909291905050505b60030b9250505092915050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff166346de0fb160e01b8787604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106105e457805182526020820191506020810190506020830392506105c1565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610646576040519150601f19603f3d011682016040523d82523d6000602084013e61064b565b606091505b50915091508161065e576015600061068f565b80806020019051604081101561067357600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b9150809450819550505050509250929050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635b8f858460e01b8686604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106107a1578051825260208201915060208101905060208303925061077e565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610803576040519150601f19603f3d011682016040523d82523d6000602084013e610808565b606091505b509150915081610819576015610840565b80806020019051602081101561082e57600080fd5b81019080805190602001909291905050505b60030b925050509291505056fea2646970667358221220ef82d532539016f11338ecabf798c00044c9b4af0ae7aadf9e1d5ac0191fe90264736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.json
deleted file mode 100644
index a26bb85a7dde..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.json
+++ /dev/null
@@ -1,62 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isTokenFrozen",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "tokenFreeze",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "tokenUnfreeze",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.bin
deleted file mode 100644
index 8501949c7285..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b503060006040516100209061025b565b808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018263ffffffff1663ffffffff16815260200192505050604051809103906000f080158015610085573d6000803e3d6000fd5b506000806003811061009357fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503060016040516100e19061025b565b808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018263ffffffff1663ffffffff16815260200192505050604051809103906000f080158015610146573d6000803e3d6000fd5b50600060016003811061015557fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055503060026040516101a39061025b565b808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018263ffffffff1663ffffffff16815260200192505050604051809103906000f080158015610208573d6000803e3d6000fd5b50600060026003811061021757fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550610268565b6101b88061049483390190565b61021d806102776000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c806364dbe78c14610030575b600080fd5b61003861003a565b005b6000806003811061004757fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b8b3dbc66040518163ffffffff1660e01b8152600401600060405180830381600087803b1580156100b057600080fd5b505af11580156100c4573d6000803e3d6000fd5b5050505060006001600381106100d657fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b8b3dbc66040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561013f57600080fd5b505af1158015610153573d6000803e3d6000fd5b50505050600060026003811061016557fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663b8b3dbc66040518163ffffffff1660e01b8152600401600060405180830381600087803b1580156101ce57600080fd5b505af11580156101e2573d6000803e3d6000fd5b5050505056fea265627a7a723158206b588769c823bd423234ca6722617c915593778773289e5ea6957f6b3083a72664736f6c63430005110032608060405234801561001057600080fd5b506040516101b83803806101b88339818101604052604081101561003357600080fd5b810190808051906020019092919080519060200190929190505050816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600060146101000a81548163ffffffff021916908363ffffffff160217905550505060f9806100bf6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063b8b3dbc614602d575b600080fd5b60336035565b005b7fefede26876416339b0a789da35176947bdd302b8ea9d495dcd6c084ec3d1cc9e600060149054906101000a900463ffffffff16604051808263ffffffff1663ffffffff16815260200191505060405180910390a16000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16fffea265627a7a72315820bb4a1e1336c34d4765471e989348103715ac247996e9ac6860f4ea459a9b2b0864736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.json
deleted file mode 100644
index 8ebae684e77e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "light",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.bin
deleted file mode 100644
index 0678fc9b7aef..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060405162000b9738038062000b97833981016040819052620000349162000245565b6040518060400160405280600481526020016311dbdb1960e21b8152506040518060400160405280600381526020016211d31160ea1b8152508160039080519060200190620000859291906200019f565b5080516200009b9060049060208401906200019f565b505050620000b03382620000b760201b60201c565b50620002c3565b6001600160a01b038216620001125760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b80600260008282546200012691906200025f565b90915550506001600160a01b03821660009081526020819052604081208054839290620001559084906200025f565b90915550506040518181526001600160a01b038316906000907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9060200160405180910390a35050565b828054620001ad9062000286565b90600052602060002090601f016020900481019282620001d157600085556200021c565b82601f10620001ec57805160ff19168380011785556200021c565b828001600101855582156200021c579182015b828111156200021c578251825591602001919060010190620001ff565b506200022a9291506200022e565b5090565b5b808211156200022a57600081556001016200022f565b6000602082840312156200025857600080fd5b5051919050565b600082198211156200028157634e487b7160e01b600052601160045260246000fd5b500190565b600181811c908216806200029b57607f821691505b60208210811415620002bd57634e487b7160e01b600052602260045260246000fd5b50919050565b6108c480620002d36000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c80633950935111610071578063395093511461012357806370a082311461013657806395d89b411461015f578063a457c2d714610167578063a9059cbb1461017a578063dd62ed3e1461018d57600080fd5b806306fdde03146100ae578063095ea7b3146100cc57806318160ddd146100ef57806323b872dd14610101578063313ce56714610114575b600080fd5b6100b66101c6565b6040516100c39190610701565b60405180910390f35b6100df6100da366004610772565b610258565b60405190151581526020016100c3565b6002545b6040519081526020016100c3565b6100df61010f36600461079c565b61026e565b604051601281526020016100c3565b6100df610131366004610772565b61031d565b6100f36101443660046107d8565b6001600160a01b031660009081526020819052604090205490565b6100b6610359565b6100df610175366004610772565b610368565b6100df610188366004610772565b610401565b6100f361019b3660046107fa565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6060600380546101d59061082d565b80601f01602080910402602001604051908101604052809291908181526020018280546102019061082d565b801561024e5780601f106102235761010080835404028352916020019161024e565b820191906000526020600020905b81548152906001019060200180831161023157829003601f168201915b5050505050905090565b600061026533848461040e565b50600192915050565b600061027b848484610532565b6001600160a01b0384166000908152600160209081526040808320338452909152902054828110156103055760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b60648201526084015b60405180910390fd5b610312853385840361040e565b506001949350505050565b3360008181526001602090815260408083206001600160a01b03871684529091528120549091610265918590610354908690610868565b61040e565b6060600480546101d59061082d565b3360009081526001602090815260408083206001600160a01b0386168452909152812054828110156103ea5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084016102fc565b6103f7338585840361040e565b5060019392505050565b6000610265338484610532565b6001600160a01b0383166104705760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016102fc565b6001600160a01b0382166104d15760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016102fc565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6001600160a01b0383166105965760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016102fc565b6001600160a01b0382166105f85760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016102fc565b6001600160a01b038316600090815260208190526040902054818110156106705760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016102fc565b6001600160a01b038085166000908152602081905260408082208585039055918516815290812080548492906106a7908490610868565b92505081905550826001600160a01b0316846001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040516106f391815260200190565b60405180910390a350505050565b600060208083528351808285015260005b8181101561072e57858101830151858201604001528201610712565b81811115610740576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b038116811461076d57600080fd5b919050565b6000806040838503121561078557600080fd5b61078e83610756565b946020939093013593505050565b6000806000606084860312156107b157600080fd5b6107ba84610756565b92506107c860208501610756565b9150604084013590509250925092565b6000602082840312156107ea57600080fd5b6107f382610756565b9392505050565b6000806040838503121561080d57600080fd5b61081683610756565b915061082460208401610756565b90509250929050565b600181811c9082168061084157607f821691505b6020821081141561086257634e487b7160e01b600052602260045260246000fd5b50919050565b6000821982111561088957634e487b7160e01b600052601160045260246000fd5b50019056fea2646970667358221220303cfdac6d38f99fba9c0b2d5ec2849406bd5a75ac4d70c618b7f79fb1e1ba6f64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.json
deleted file mode 100644
index 39ce956d9f73..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.json
+++ /dev/null
@@ -1,283 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "initialSupply",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      }
-    ],
-    "name": "allowance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "decimals",
-    "outputs": [
-      {
-        "internalType": "uint8",
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "subtractedValue",
-        "type": "uint256"
-      }
-    ],
-    "name": "decreaseAllowance",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "addedValue",
-        "type": "uint256"
-      }
-    ],
-    "name": "increaseAllowance",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.bin
deleted file mode 100644
index 25680d4e0c09..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b506040518060400160405280600881526020017f47616d654974656d0000000000000000000000000000000000000000000000008152506040518060400160405280600381526020017f49544d0000000000000000000000000000000000000000000000000000000000815250816000908051906020019062000096929190620000b8565b508060019080519060200190620000af929190620000b8565b505050620001cd565b828054620000c69062000197565b90600052602060002090601f016020900481019282620000ea576000855562000136565b82601f106200010557805160ff191683800117855562000136565b8280016001018555821562000136579182015b828111156200013557825182559160200191906001019062000118565b5b50905062000145919062000149565b5090565b5b80821115620001645760008160009055506001016200014a565b5090565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620001b057607f821691505b60208210811415620001c757620001c662000168565b5b50919050565b6128d580620001dd6000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80636352211e1161008c578063a22cb46511610066578063a22cb4651461026f578063b88d4fde1461028b578063c87b56dd146102a7578063e985e9c5146102d7576100ea565b80636352211e146101f157806370a082311461022157806395d89b4114610251576100ea565b8063095ea7b3116100c8578063095ea7b31461016d57806323b872dd1461018957806340c10f19146101a557806342842e0e146101d5576100ea565b806301ffc9a7146100ef57806306fdde031461011f578063081812fc1461013d575b600080fd5b610109600480360381019061010491906117c6565b610307565b604051610116919061180e565b60405180910390f35b6101276103e9565b60405161013491906118c2565b60405180910390f35b6101576004803603810190610152919061191a565b61047b565b6040516101649190611988565b60405180910390f35b610187600480360381019061018291906119cf565b610500565b005b6101a3600480360381019061019e9190611a0f565b610618565b005b6101bf60048036038101906101ba91906119cf565b610678565b6040516101cc9190611a71565b60405180910390f35b6101ef60048036038101906101ea9190611a0f565b61068d565b005b61020b6004803603810190610206919061191a565b6106ad565b6040516102189190611988565b60405180910390f35b61023b60048036038101906102369190611a8c565b61075f565b6040516102489190611a71565b60405180910390f35b610259610817565b60405161026691906118c2565b60405180910390f35b61028960048036038101906102849190611ae5565b6108a9565b005b6102a560048036038101906102a09190611c5a565b6108bf565b005b6102c160048036038101906102bc919061191a565b610921565b6040516102ce91906118c2565b60405180910390f35b6102f160048036038101906102ec9190611cdd565b610a73565b6040516102fe919061180e565b60405180910390f35b60007f80ac58cd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191614806103d257507f5b5e139f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916145b806103e257506103e182610b07565b5b9050919050565b6060600080546103f890611d4c565b80601f016020809104026020016040519081016040528092919081815260200182805461042490611d4c565b80156104715780601f1061044657610100808354040283529160200191610471565b820191906000526020600020905b81548152906001019060200180831161045457829003601f168201915b5050505050905090565b600061048682610b71565b6104c5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104bc90611df0565b60405180910390fd5b6004600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600061050b826106ad565b90508073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561057c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161057390611e82565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1661059b610bdd565b73ffffffffffffffffffffffffffffffffffffffff1614806105ca57506105c9816105c4610bdd565b610a73565b5b610609576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161060090611f14565b60405180910390fd5b6106138383610be5565b505050565b610629610623610bdd565b82610c9e565b610668576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065f90611fa6565b60405180910390fd5b610673838383610d7c565b505050565b60006106848383610fe3565b81905092915050565b6106a8838383604051806020016040528060008152506108bf565b505050565b6000806002600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415610756576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161074d90612038565b60405180910390fd5b80915050919050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156107d0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107c7906120ca565b60405180910390fd5b600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60606001805461082690611d4c565b80601f016020809104026020016040519081016040528092919081815260200182805461085290611d4c565b801561089f5780601f106108745761010080835404028352916020019161089f565b820191906000526020600020905b81548152906001019060200180831161088257829003601f168201915b5050505050905090565b6108bb6108b4610bdd565b83836111bd565b5050565b6108d06108ca610bdd565b83610c9e565b61090f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090690611fa6565b60405180910390fd5b61091b8484848461132a565b50505050565b606061092c82610b71565b61096b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109629061215c565b60405180910390fd5b600060066000848152602001908152602001600020805461098b90611d4c565b80601f01602080910402602001604051908101604052809291908181526020018280546109b790611d4c565b8015610a045780601f106109d957610100808354040283529160200191610a04565b820191906000526020600020905b8154815290600101906020018083116109e757829003601f168201915b505050505090506000610a15611386565b9050600081511415610a2b578192505050610a6e565b600082511115610a60578082604051602001610a489291906121b8565b60405160208183030381529060405292505050610a6e565b610a698461139d565b925050505b919050565b6000600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b60008073ffffffffffffffffffffffffffffffffffffffff166002600084815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614159050919050565b600033905090565b816004600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff16610c58836106ad565b73ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a45050565b6000610ca982610b71565b610ce8576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610cdf9061224e565b60405180910390fd5b6000610cf3836106ad565b90508073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161480610d6257508373ffffffffffffffffffffffffffffffffffffffff16610d4a8461047b565b73ffffffffffffffffffffffffffffffffffffffff16145b80610d735750610d728185610a73565b5b91505092915050565b8273ffffffffffffffffffffffffffffffffffffffff16610d9c826106ad565b73ffffffffffffffffffffffffffffffffffffffff1614610df2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de9906122e0565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610e62576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e5990612372565b60405180910390fd5b610e6d838383611444565b610e78600082610be5565b6001600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610ec891906123c1565b925050819055506001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610f1f91906123f5565b92505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4610fde838383611449565b505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415611053576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161104a90612497565b60405180910390fd5b61105c81610b71565b1561109c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161109390612503565b60405180910390fd5b6110a860008383611444565b6001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110f891906123f5565b92505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a46111b960008383611449565b5050565b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561122c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112239061256f565b60405180910390fd5b80600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c318360405161131d919061180e565b60405180910390a3505050565b611335848484610d7c565b6113418484848461144e565b611380576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161137790612601565b60405180910390fd5b50505050565b606060405180602001604052806000815250905090565b60606113a882610b71565b6113e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113de90612693565b60405180910390fd5b60006113f1611386565b90506000815111611411576040518060200160405280600081525061143c565b8061141b846115d6565b60405160200161142c9291906121b8565b6040516020818303038152906040525b915050919050565b505050565b505050565b600061146f8473ffffffffffffffffffffffffffffffffffffffff16611737565b156115c9578373ffffffffffffffffffffffffffffffffffffffff1663150b7a02611498610bdd565b8786866040518563ffffffff1660e01b81526004016114ba9493929190612708565b6020604051808303816000875af19250505080156114f657506040513d601f19601f820116820180604052508101906114f39190612769565b60015b611579573d8060008114611526576040519150601f19603f3d011682016040523d82523d6000602084013e61152b565b606091505b50600081511415611571576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161156890612601565b60405180910390fd5b805181602001fd5b63150b7a0260e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149150506115ce565b600190505b949350505050565b6060600082141561161e576040518060400160405280600181526020017f30000000000000000000000000000000000000000000000000000000000000008152509050611732565b600082905060005b6000821461165057808061163990612796565b915050600a82611649919061280e565b9150611626565b60008167ffffffffffffffff81111561166c5761166b611b2f565b5b6040519080825280601f01601f19166020018201604052801561169e5781602001600182028036833780820191505090505b5090505b6000851461172b576001826116b791906123c1565b9150600a856116c6919061283f565b60306116d291906123f5565b60f81b8183815181106116e8576116e7612870565b5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350600a85611724919061280e565b94506116a2565b8093505050505b919050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6117a38161176e565b81146117ae57600080fd5b50565b6000813590506117c08161179a565b92915050565b6000602082840312156117dc576117db611764565b5b60006117ea848285016117b1565b91505092915050565b60008115159050919050565b611808816117f3565b82525050565b600060208201905061182360008301846117ff565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611863578082015181840152602081019050611848565b83811115611872576000848401525b50505050565b6000601f19601f8301169050919050565b600061189482611829565b61189e8185611834565b93506118ae818560208601611845565b6118b781611878565b840191505092915050565b600060208201905081810360008301526118dc8184611889565b905092915050565b6000819050919050565b6118f7816118e4565b811461190257600080fd5b50565b600081359050611914816118ee565b92915050565b6000602082840312156119305761192f611764565b5b600061193e84828501611905565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061197282611947565b9050919050565b61198281611967565b82525050565b600060208201905061199d6000830184611979565b92915050565b6119ac81611967565b81146119b757600080fd5b50565b6000813590506119c9816119a3565b92915050565b600080604083850312156119e6576119e5611764565b5b60006119f4858286016119ba565b9250506020611a0585828601611905565b9150509250929050565b600080600060608486031215611a2857611a27611764565b5b6000611a36868287016119ba565b9350506020611a47868287016119ba565b9250506040611a5886828701611905565b9150509250925092565b611a6b816118e4565b82525050565b6000602082019050611a866000830184611a62565b92915050565b600060208284031215611aa257611aa1611764565b5b6000611ab0848285016119ba565b91505092915050565b611ac2816117f3565b8114611acd57600080fd5b50565b600081359050611adf81611ab9565b92915050565b60008060408385031215611afc57611afb611764565b5b6000611b0a858286016119ba565b9250506020611b1b85828601611ad0565b9150509250929050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b611b6782611878565b810181811067ffffffffffffffff82111715611b8657611b85611b2f565b5b80604052505050565b6000611b9961175a565b9050611ba58282611b5e565b919050565b600067ffffffffffffffff821115611bc557611bc4611b2f565b5b611bce82611878565b9050602081019050919050565b82818337600083830152505050565b6000611bfd611bf884611baa565b611b8f565b905082815260208101848484011115611c1957611c18611b2a565b5b611c24848285611bdb565b509392505050565b600082601f830112611c4157611c40611b25565b5b8135611c51848260208601611bea565b91505092915050565b60008060008060808587031215611c7457611c73611764565b5b6000611c82878288016119ba565b9450506020611c93878288016119ba565b9350506040611ca487828801611905565b925050606085013567ffffffffffffffff811115611cc557611cc4611769565b5b611cd187828801611c2c565b91505092959194509250565b60008060408385031215611cf457611cf3611764565b5b6000611d02858286016119ba565b9250506020611d13858286016119ba565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680611d6457607f821691505b60208210811415611d7857611d77611d1d565b5b50919050565b7f4552433732313a20617070726f76656420717565727920666f72206e6f6e657860008201527f697374656e7420746f6b656e0000000000000000000000000000000000000000602082015250565b6000611dda602c83611834565b9150611de582611d7e565b604082019050919050565b60006020820190508181036000830152611e0981611dcd565b9050919050565b7f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560008201527f7200000000000000000000000000000000000000000000000000000000000000602082015250565b6000611e6c602183611834565b9150611e7782611e10565b604082019050919050565b60006020820190508181036000830152611e9b81611e5f565b9050919050565b7f4552433732313a20617070726f76652063616c6c6572206973206e6f74206f7760008201527f6e6572206e6f7220617070726f76656420666f7220616c6c0000000000000000602082015250565b6000611efe603883611834565b9150611f0982611ea2565b604082019050919050565b60006020820190508181036000830152611f2d81611ef1565b9050919050565b7f4552433732313a207472616e736665722063616c6c6572206973206e6f74206f60008201527f776e6572206e6f7220617070726f766564000000000000000000000000000000602082015250565b6000611f90603183611834565b9150611f9b82611f34565b604082019050919050565b60006020820190508181036000830152611fbf81611f83565b9050919050565b7f4552433732313a206f776e657220717565727920666f72206e6f6e657869737460008201527f656e7420746f6b656e0000000000000000000000000000000000000000000000602082015250565b6000612022602983611834565b915061202d82611fc6565b604082019050919050565b6000602082019050818103600083015261205181612015565b9050919050565b7f4552433732313a2062616c616e636520717565727920666f7220746865207a6560008201527f726f206164647265737300000000000000000000000000000000000000000000602082015250565b60006120b4602a83611834565b91506120bf82612058565b604082019050919050565b600060208201905081810360008301526120e3816120a7565b9050919050565b7f45524337323155524953746f726167653a2055524920717565727920666f722060008201527f6e6f6e6578697374656e7420746f6b656e000000000000000000000000000000602082015250565b6000612146603183611834565b9150612151826120ea565b604082019050919050565b6000602082019050818103600083015261217581612139565b9050919050565b600081905092915050565b600061219282611829565b61219c818561217c565b93506121ac818560208601611845565b80840191505092915050565b60006121c48285612187565b91506121d08284612187565b91508190509392505050565b7f4552433732313a206f70657261746f7220717565727920666f72206e6f6e657860008201527f697374656e7420746f6b656e0000000000000000000000000000000000000000602082015250565b6000612238602c83611834565b9150612243826121dc565b604082019050919050565b600060208201905081810360008301526122678161222b565b9050919050565b7f4552433732313a207472616e736665722066726f6d20696e636f72726563742060008201527f6f776e6572000000000000000000000000000000000000000000000000000000602082015250565b60006122ca602583611834565b91506122d58261226e565b604082019050919050565b600060208201905081810360008301526122f9816122bd565b9050919050565b7f4552433732313a207472616e7366657220746f20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b600061235c602483611834565b915061236782612300565b604082019050919050565b6000602082019050818103600083015261238b8161234f565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006123cc826118e4565b91506123d7836118e4565b9250828210156123ea576123e9612392565b5b828203905092915050565b6000612400826118e4565b915061240b836118e4565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156124405761243f612392565b5b828201905092915050565b7f4552433732313a206d696e7420746f20746865207a65726f2061646472657373600082015250565b6000612481602083611834565b915061248c8261244b565b602082019050919050565b600060208201905081810360008301526124b081612474565b9050919050565b7f4552433732313a20746f6b656e20616c7265616479206d696e74656400000000600082015250565b60006124ed601c83611834565b91506124f8826124b7565b602082019050919050565b6000602082019050818103600083015261251c816124e0565b9050919050565b7f4552433732313a20617070726f766520746f2063616c6c657200000000000000600082015250565b6000612559601983611834565b915061256482612523565b602082019050919050565b600060208201905081810360008301526125888161254c565b9050919050565b7f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560008201527f63656976657220696d706c656d656e7465720000000000000000000000000000602082015250565b60006125eb603283611834565b91506125f68261258f565b604082019050919050565b6000602082019050818103600083015261261a816125de565b9050919050565b7f4552433732314d657461646174613a2055524920717565727920666f72206e6f60008201527f6e6578697374656e7420746f6b656e0000000000000000000000000000000000602082015250565b600061267d602f83611834565b915061268882612621565b604082019050919050565b600060208201905081810360008301526126ac81612670565b9050919050565b600081519050919050565b600082825260208201905092915050565b60006126da826126b3565b6126e481856126be565b93506126f4818560208601611845565b6126fd81611878565b840191505092915050565b600060808201905061271d6000830187611979565b61272a6020830186611979565b6127376040830185611a62565b818103606083015261274981846126cf565b905095945050505050565b6000815190506127638161179a565b92915050565b60006020828403121561277f5761277e611764565b5b600061278d84828501612754565b91505092915050565b60006127a1826118e4565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156127d4576127d3612392565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000612819826118e4565b9150612824836118e4565b925082612834576128336127df565b5b828204905092915050565b600061284a826118e4565b9150612855836118e4565b925082612865576128646127df565b5b828206905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea26469706673582212208492dc96cb65418a558dca27e34f7afa35b23c63d4ab164ee1cdf37ff12d831464736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.json
deleted file mode 100644
index 48cad46f865b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.json
+++ /dev/null
@@ -1,361 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "approved",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "ApprovalForAll",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getApproved",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "name": "isApprovedForAll",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "player",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenid",
-        "type": "uint256"
-      }
-    ],
-    "name": "mint",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ownerOf",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "setApprovalForAll",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "interfaceId",
-        "type": "bytes4"
-      }
-    ],
-    "name": "supportsInterface",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenURI",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.bin
deleted file mode 100644
index 46effe890231..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060405180606001604052806027815260200162002a35602791396200003d816200004460201b60201c565b5062000175565b80600290805190602001906200005c92919062000060565b5050565b8280546200006e906200013f565b90600052602060002090601f016020900481019282620000925760008555620000de565b82601f10620000ad57805160ff1916838001178555620000de565b82800160010185558215620000de579182015b82811115620000dd578251825591602001919060010190620000c0565b5b509050620000ed9190620000f1565b5090565b5b808211156200010c576000816000905550600101620000f2565b5090565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200015857607f821691505b602082108114156200016f576200016e62000110565b5b50919050565b6128b080620001856000396000f3fe608060405234801561001057600080fd5b50600436106100a85760003560e01c80634e1273f4116100715780634e1273f414610177578063a22cb465146101a7578063d890c8e2146101c3578063e3e55f08146101df578063e985e9c5146101fd578063f242432a1461022d576100a8565b8062fdd58e146100ad57806301ffc9a7146100dd5780630e89341c1461010d5780632eb2c2d61461013d5780633e4bee3814610159575b600080fd5b6100c760048036038101906100c291906115bf565b610249565b6040516100d4919061160e565b60405180910390f35b6100f760048036038101906100f29190611681565b610312565b60405161010491906116c9565b60405180910390f35b610127600480360381019061012291906116e4565b6103f4565b60405161013491906117aa565b60405180910390f35b610157600480360381019061015291906119c9565b610488565b005b610161610529565b60405161016e919061160e565b60405180910390f35b610191600480360381019061018c9190611b5b565b61052e565b60405161019e9190611c91565b60405180910390f35b6101c160048036038101906101bc9190611cdf565b610647565b005b6101dd60048036038101906101d89190611d1f565b61065d565b005b6101e761067d565b6040516101f4919061160e565b60405180910390f35b61021760048036038101906102129190611d72565b610682565b60405161022491906116c9565b60405180910390f35b61024760048036038101906102429190611db2565b610716565b005b60008073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1614156102ba576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102b190611ebb565b60405180910390fd5b60008083815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60007fd9b67a26000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191614806103dd57507f0e89341c000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916145b806103ed57506103ec826107b7565b5b9050919050565b60606002805461040390611f0a565b80601f016020809104026020016040519081016040528092919081815260200182805461042f90611f0a565b801561047c5780601f106104515761010080835404028352916020019161047c565b820191906000526020600020905b81548152906001019060200180831161045f57829003601f168201915b50505050509050919050565b610490610821565b73ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff1614806104d657506104d5856104d0610821565b610682565b5b610515576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161050c90611fae565b60405180910390fd5b6105228585858585610829565b5050505050565b600081565b60608151835114610574576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161056b90612040565b60405180910390fd5b6000835167ffffffffffffffff811115610591576105906117d1565b5b6040519080825280602002602001820160405280156105bf5781602001602082028036833780820191505090505b50905060005b845181101561063c5761060c8582815181106105e4576105e3612060565b5b60200260200101518583815181106105ff576105fe612060565b5b6020026020010151610249565b82828151811061061f5761061e612060565b5b60200260200101818152505080610635906120be565b90506105c5565b508091505092915050565b610659610652610821565b8383610b3d565b5050565b61067881848460405180602001604052806000815250610caa565b505050565b600181565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b61071e610821565b73ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16148061076457506107638561075e610821565b610682565b5b6107a3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161079a90612179565b60405180910390fd5b6107b08585858585610e40565b5050505050565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b600033905090565b815183511461086d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108649061220b565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1614156108dd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108d49061229d565b60405180910390fd5b60006108e7610821565b90506108f78187878787876110c2565b60005b8451811015610aa857600085828151811061091857610917612060565b5b60200260200101519050600085838151811061093757610936612060565b5b60200260200101519050600080600084815260200190815260200160002060008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050818110156109d8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109cf9061232f565b60405180910390fd5b81810360008085815260200190815260200160002060008c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508160008085815260200190815260200160002060008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610a8d919061234f565b9250508190555050505080610aa1906120be565b90506108fa565b508473ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167f4a39dc06d4c0dbc64b70af90fd698a233a518aa5d07e595d983b8c0526c8f7fb8787604051610b1f9291906123a5565b60405180910390a4610b358187878787876110ca565b505050505050565b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610bac576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ba39061244e565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3183604051610c9d91906116c9565b60405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415610d1a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d11906124e0565b60405180910390fd5b6000610d24610821565b9050610d4581600087610d36886112a2565b610d3f886112a2565b876110c2565b8260008086815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254610da4919061234f565b925050819055508473ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167fc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f628787604051610e22929190612500565b60405180910390a4610e398160008787878761131c565b5050505050565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415610eb0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ea79061229d565b60405180910390fd5b6000610eba610821565b9050610eda818787610ecb886112a2565b610ed4886112a2565b876110c2565b600080600086815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905083811015610f71576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f689061232f565b60405180910390fd5b83810360008087815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508360008087815260200190815260200160002060008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254611026919061234f565b925050819055508573ffffffffffffffffffffffffffffffffffffffff168773ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fc3d58168c5ae7397731d063d5bbf3d657854427343f4c083240f7aacaa2d0f6288886040516110a3929190612500565b60405180910390a46110b982888888888861131c565b50505050505050565b505050505050565b6110e98473ffffffffffffffffffffffffffffffffffffffff166114f4565b1561129a578373ffffffffffffffffffffffffffffffffffffffff1663bc197c8187878686866040518663ffffffff1660e01b815260040161112f95949392919061258d565b6020604051808303816000875af192505050801561116b57506040513d601f19601f82011682018060405250810190611168919061260a565b60015b61121157611177612644565b806308c379a014156111d4575061118c612666565b8061119757506111d6565b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111cb91906117aa565b60405180910390fd5b505b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112089061276e565b60405180910390fd5b63bc197c8160e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191614611298576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161128f90612800565b60405180910390fd5b505b505050505050565b60606000600167ffffffffffffffff8111156112c1576112c06117d1565b5b6040519080825280602002602001820160405280156112ef5781602001602082028036833780820191505090505b509050828160008151811061130757611306612060565b5b60200260200101818152505080915050919050565b61133b8473ffffffffffffffffffffffffffffffffffffffff166114f4565b156114ec578373ffffffffffffffffffffffffffffffffffffffff1663f23a6e6187878686866040518663ffffffff1660e01b8152600401611381959493929190612820565b6020604051808303816000875af19250505080156113bd57506040513d601f19601f820116820180604052508101906113ba919061260a565b60015b611463576113c9612644565b806308c379a0141561142657506113de612666565b806113e95750611428565b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161141d91906117aa565b60405180910390fd5b505b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161145a9061276e565b60405180910390fd5b63f23a6e6160e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916146114ea576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114e190612800565b60405180910390fd5b505b505050505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006115568261152b565b9050919050565b6115668161154b565b811461157157600080fd5b50565b6000813590506115838161155d565b92915050565b6000819050919050565b61159c81611589565b81146115a757600080fd5b50565b6000813590506115b981611593565b92915050565b600080604083850312156115d6576115d5611521565b5b60006115e485828601611574565b92505060206115f5858286016115aa565b9150509250929050565b61160881611589565b82525050565b600060208201905061162360008301846115ff565b92915050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b61165e81611629565b811461166957600080fd5b50565b60008135905061167b81611655565b92915050565b60006020828403121561169757611696611521565b5b60006116a58482850161166c565b91505092915050565b60008115159050919050565b6116c3816116ae565b82525050565b60006020820190506116de60008301846116ba565b92915050565b6000602082840312156116fa576116f9611521565b5b6000611708848285016115aa565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561174b578082015181840152602081019050611730565b8381111561175a576000848401525b50505050565b6000601f19601f8301169050919050565b600061177c82611711565b611786818561171c565b935061179681856020860161172d565b61179f81611760565b840191505092915050565b600060208201905081810360008301526117c48184611771565b905092915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61180982611760565b810181811067ffffffffffffffff82111715611828576118276117d1565b5b80604052505050565b600061183b611517565b90506118478282611800565b919050565b600067ffffffffffffffff821115611867576118666117d1565b5b602082029050602081019050919050565b600080fd5b600061189061188b8461184c565b611831565b905080838252602082019050602084028301858111156118b3576118b2611878565b5b835b818110156118dc57806118c888826115aa565b8452602084019350506020810190506118b5565b5050509392505050565b600082601f8301126118fb576118fa6117cc565b5b813561190b84826020860161187d565b91505092915050565b600080fd5b600067ffffffffffffffff821115611934576119336117d1565b5b61193d82611760565b9050602081019050919050565b82818337600083830152505050565b600061196c61196784611919565b611831565b90508281526020810184848401111561198857611987611914565b5b61199384828561194a565b509392505050565b600082601f8301126119b0576119af6117cc565b5b81356119c0848260208601611959565b91505092915050565b600080600080600060a086880312156119e5576119e4611521565b5b60006119f388828901611574565b9550506020611a0488828901611574565b945050604086013567ffffffffffffffff811115611a2557611a24611526565b5b611a31888289016118e6565b935050606086013567ffffffffffffffff811115611a5257611a51611526565b5b611a5e888289016118e6565b925050608086013567ffffffffffffffff811115611a7f57611a7e611526565b5b611a8b8882890161199b565b9150509295509295909350565b600067ffffffffffffffff821115611ab357611ab26117d1565b5b602082029050602081019050919050565b6000611ad7611ad284611a98565b611831565b90508083825260208201905060208402830185811115611afa57611af9611878565b5b835b81811015611b235780611b0f8882611574565b845260208401935050602081019050611afc565b5050509392505050565b600082601f830112611b4257611b416117cc565b5b8135611b52848260208601611ac4565b91505092915050565b60008060408385031215611b7257611b71611521565b5b600083013567ffffffffffffffff811115611b9057611b8f611526565b5b611b9c85828601611b2d565b925050602083013567ffffffffffffffff811115611bbd57611bbc611526565b5b611bc9858286016118e6565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b611c0881611589565b82525050565b6000611c1a8383611bff565b60208301905092915050565b6000602082019050919050565b6000611c3e82611bd3565b611c488185611bde565b9350611c5383611bef565b8060005b83811015611c84578151611c6b8882611c0e565b9750611c7683611c26565b925050600181019050611c57565b5085935050505092915050565b60006020820190508181036000830152611cab8184611c33565b905092915050565b611cbc816116ae565b8114611cc757600080fd5b50565b600081359050611cd981611cb3565b92915050565b60008060408385031215611cf657611cf5611521565b5b6000611d0485828601611574565b9250506020611d1585828601611cca565b9150509250929050565b600080600060608486031215611d3857611d37611521565b5b6000611d46868287016115aa565b9350506020611d57868287016115aa565b9250506040611d6886828701611574565b9150509250925092565b60008060408385031215611d8957611d88611521565b5b6000611d9785828601611574565b9250506020611da885828601611574565b9150509250929050565b600080600080600060a08688031215611dce57611dcd611521565b5b6000611ddc88828901611574565b9550506020611ded88828901611574565b9450506040611dfe888289016115aa565b9350506060611e0f888289016115aa565b925050608086013567ffffffffffffffff811115611e3057611e2f611526565b5b611e3c8882890161199b565b9150509295509295909350565b7f455243313135353a2062616c616e636520717565727920666f7220746865207a60008201527f65726f2061646472657373000000000000000000000000000000000000000000602082015250565b6000611ea5602b8361171c565b9150611eb082611e49565b604082019050919050565b60006020820190508181036000830152611ed481611e98565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680611f2257607f821691505b60208210811415611f3657611f35611edb565b5b50919050565b7f455243313135353a207472616e736665722063616c6c6572206973206e6f742060008201527f6f776e6572206e6f7220617070726f7665640000000000000000000000000000602082015250565b6000611f9860328361171c565b9150611fa382611f3c565b604082019050919050565b60006020820190508181036000830152611fc781611f8b565b9050919050565b7f455243313135353a206163636f756e747320616e6420696473206c656e67746860008201527f206d69736d617463680000000000000000000000000000000000000000000000602082015250565b600061202a60298361171c565b915061203582611fce565b604082019050919050565b600060208201905081810360008301526120598161201d565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006120c982611589565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156120fc576120fb61208f565b5b600182019050919050565b7f455243313135353a2063616c6c6572206973206e6f74206f776e6572206e6f7260008201527f20617070726f7665640000000000000000000000000000000000000000000000602082015250565b600061216360298361171c565b915061216e82612107565b604082019050919050565b6000602082019050818103600083015261219281612156565b9050919050565b7f455243313135353a2069647320616e6420616d6f756e7473206c656e6774682060008201527f6d69736d61746368000000000000000000000000000000000000000000000000602082015250565b60006121f560288361171c565b915061220082612199565b604082019050919050565b60006020820190508181036000830152612224816121e8565b9050919050565b7f455243313135353a207472616e7366657220746f20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061228760258361171c565b91506122928261222b565b604082019050919050565b600060208201905081810360008301526122b68161227a565b9050919050565b7f455243313135353a20696e73756666696369656e742062616c616e636520666f60008201527f72207472616e7366657200000000000000000000000000000000000000000000602082015250565b6000612319602a8361171c565b9150612324826122bd565b604082019050919050565b600060208201905081810360008301526123488161230c565b9050919050565b600061235a82611589565b915061236583611589565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0382111561239a5761239961208f565b5b828201905092915050565b600060408201905081810360008301526123bf8185611c33565b905081810360208301526123d38184611c33565b90509392505050565b7f455243313135353a2073657474696e6720617070726f76616c2073746174757360008201527f20666f722073656c660000000000000000000000000000000000000000000000602082015250565b600061243860298361171c565b9150612443826123dc565b604082019050919050565b600060208201905081810360008301526124678161242b565b9050919050565b7f455243313135353a206d696e7420746f20746865207a65726f2061646472657360008201527f7300000000000000000000000000000000000000000000000000000000000000602082015250565b60006124ca60218361171c565b91506124d58261246e565b604082019050919050565b600060208201905081810360008301526124f9816124bd565b9050919050565b600060408201905061251560008301856115ff565b61252260208301846115ff565b9392505050565b6125328161154b565b82525050565b600081519050919050565b600082825260208201905092915050565b600061255f82612538565b6125698185612543565b935061257981856020860161172d565b61258281611760565b840191505092915050565b600060a0820190506125a26000830188612529565b6125af6020830187612529565b81810360408301526125c18186611c33565b905081810360608301526125d58185611c33565b905081810360808301526125e98184612554565b90509695505050505050565b60008151905061260481611655565b92915050565b6000602082840312156126205761261f611521565b5b600061262e848285016125f5565b91505092915050565b60008160e01c9050919050565b600060033d11156126635760046000803e612660600051612637565b90505b90565b600060443d1015612676576126f9565b61267e611517565b60043d036004823e80513d602482011167ffffffffffffffff821117156126a65750506126f9565b808201805167ffffffffffffffff8111156126c457505050506126f9565b80602083010160043d0385018111156126e15750505050506126f9565b6126f082602001850186611800565b82955050505050505b90565b7f455243313135353a207472616e7366657220746f206e6f6e204552433131353560008201527f526563656976657220696d706c656d656e746572000000000000000000000000602082015250565b600061275860348361171c565b9150612763826126fc565b604082019050919050565b600060208201905081810360008301526127878161274b565b9050919050565b7f455243313135353a204552433131353552656365697665722072656a6563746560008201527f6420746f6b656e73000000000000000000000000000000000000000000000000602082015250565b60006127ea60288361171c565b91506127f58261278e565b604082019050919050565b60006020820190508181036000830152612819816127dd565b9050919050565b600060a0820190506128356000830188612529565b6128426020830187612529565b61284f60408301866115ff565b61285c60608301856115ff565b818103608083015261286e8184612554565b9050969550505050505056fea2646970667358221220bfcc2990cbd730e9e8524624c6528b1afa0fc348b515b54f5f1d485068395f6064736f6c634300080c003368747470733a2f2f67616d652e6578616d706c652f6170692f6974656d2f7b69647d2e6a736f6e
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.json
deleted file mode 100644
index b6ac37956aa8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.json
+++ /dev/null
@@ -1,368 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "ApprovalForAll",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256[]",
-        "name": "ids",
-        "type": "uint256[]"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256[]",
-        "name": "values",
-        "type": "uint256[]"
-      }
-    ],
-    "name": "TransferBatch",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "TransferSingle",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "value",
-        "type": "string"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      }
-    ],
-    "name": "URI",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "GOLD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "SILVER",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "accounts",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "ids",
-        "type": "uint256[]"
-      }
-    ],
-    "name": "balanceOfBatch",
-    "outputs": [
-      {
-        "internalType": "uint256[]",
-        "name": "",
-        "type": "uint256[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "name": "isApprovedForAll",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenType",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      }
-    ],
-    "name": "mintToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "ids",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "amounts",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "safeBatchTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "id",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "setApprovalForAll",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "interfaceId",
-        "type": "bytes4"
-      }
-    ],
-    "name": "supportsInterface",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "uri",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.bin
deleted file mode 100644
index db84d4cb6300..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506101af806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806315e812ad146100515780631a93d1c31461006f578063564b81ef1461008d578063d1a82a9d146100ab575b600080fd5b6100596100c9565b6040516100669190610122565b60405180910390f35b6100776100d1565b6040516100849190610122565b60405180910390f35b6100956100d9565b6040516100a29190610122565b60405180910390f35b6100b36100e1565b6040516100c09190610107565b60405180910390f35b600048905090565b600045905090565b600046905090565b600041905090565b6100f28161013d565b82525050565b6101018161016f565b82525050565b600060208201905061011c60008301846100e9565b92915050565b600060208201905061013760008301846100f8565b92915050565b60006101488261014f565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600081905091905056fea264697066735822122043cf6969d7355a626c3c8b94b1348c60055d603a111814936d163897fe282db464736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.json
deleted file mode 100644
index d00a90254e0f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "getBaseFee",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getChainID",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getCoinbase",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getGasLimit",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.bin
deleted file mode 100644
index f5206948053e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506107cd806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80633a858029146100515780636a147ffd14610095578063cded209f1461016d578063dc9dbe7a146101d1575b600080fd5b6100936004803603602081101561006757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610235565b005b61016b600480360360408110156100ab57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001906401000000008111156100e857600080fd5b8201836020820111156100fa57600080fd5b8035906020019184602083028401116401000000008311171561011c57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f8201169050808301925050505050505091929192905050506103d6565b005b6101cf6004803603604081101561018357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061051a565b005b610233600480360360408110156101e757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610623565b005b6000606061016773ffffffffffffffffffffffffffffffffffffffff1663f303b3d160e01b84604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061031157805182526020820191506020810190506020830392506102ee565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610371576040519150601f19603f3d011682016040523d82523d6000602084013e610376565b606091505b5091509150816103d1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260308152602001806107686030913960400191505060405180910390fd5b505050565b61016773ffffffffffffffffffffffffffffffffffffffff1663f303b3d160e01b83604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106104ae578051825260208201915060208101905060208303925061048b565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d806000811461050e576040519150601f19603f3d011682016040523d82523d6000602084013e610513565b606091505b5050505050565b61016773ffffffffffffffffffffffffffffffffffffffff166040516020018080602001828103825260068152602001807f30786364636400000000000000000000000000000000000000000000000000008152506020019150506040516020818303038152906040526040518082805190602001908083835b602083106105b75780518252602082019150602081019050602083039250610594565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610617576040519150601f19603f3d011682016040523d82523d6000602084013e61061c565b606091505b5050505050565b61016773ffffffffffffffffffffffffffffffffffffffff1663918cce1b60e01b30604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106106fb57805182526020820191506020810190506020830392506106d8565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d806000811461075b576040519150601f19603f3d011682016040523d82523d6000602084013e610760565b606091505b505050505056fe496e76616c69646c7920466f726d61747465642053696e676c652046756e6374696f6e2043616c6c206661696c656421a2646970667358221220e2dc13f6234f4969b74633d372fc40d3607ec0348cd52802b7c231642cf73beb64736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.json
deleted file mode 100644
index a10d77a4e0ee..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.json
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "performInvalidlyFormattedFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      }
-    ],
-    "name": "performInvalidlyFormattedSingleFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "performLessThanFourBytesFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "performNonExistingServiceFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.bin
deleted file mode 100644
index 41e0bfe09b5c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506104d1806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806335f3bfa9146100465780636538ae3114610050578063d83bf9a11461005a575b600080fd5b61004e610078565b005b610058610112565b005b6100626101f9565b60405161006f9190610314565b60405180910390f35b60008061016973ffffffffffffffffffffffffffffffffffffffff166040516020016100a39061038c565b6040516020818303038152906040526040516100bf9190610426565b600060405180830381855af49150503d80600081146100fa576040519150601f19603f3d011682016040523d82523d6000602084013e6100ff565b606091505b50915091508161010e57600080fd5b5050565b60008061016973ffffffffffffffffffffffffffffffffffffffff1663762eccf760e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101a69190610426565b600060405180830381855af49150503d80600081146101e1576040519150601f19603f3d011682016040523d82523d6000602084013e6101e6565b606091505b5091509150816101f557600080fd5b5050565b600080600061016973ffffffffffffffffffffffffffffffffffffffff1663d83bf9a160e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161028f9190610426565b6000604051808303816000865af19150503d80600081146102cc576040519150601f19603f3d011682016040523d82523d6000602084013e6102d1565b606091505b5091509150816102e057600080fd5b808060200190518101906102f4919061046e565b9250505090565b6000819050919050565b61030e816102fb565b82525050565b60006020820190506103296000830184610305565b92915050565b600082825260208201905092915050565b7f3078636463640000000000000000000000000000000000000000000000000000600082015250565b600061037660068361032f565b915061038182610340565b602082019050919050565b600060208201905081810360008301526103a581610369565b9050919050565b600081519050919050565b600081905092915050565b60005b838110156103e05780820151818401526020810190506103c5565b838111156103ef576000848401525b50505050565b6000610400826103ac565b61040a81856103b7565b935061041a8185602086016103c2565b80840191505092915050565b600061043282846103f5565b915081905092915050565b600080fd5b61044b816102fb565b811461045657600080fd5b50565b60008151905061046881610442565b92915050565b6000602082840312156104845761048361043d565b5b600061049284828501610459565b9150509291505056fea2646970667358221220edfa63a29d958d5c19276cea8aa1ec94847d94135e6f20bbc705f31242e5426a64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.json
deleted file mode 100644
index cd9aae7b511e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "getPseudorandomSeed",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "randomBytes",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "performLessThanFourBytesFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "performNonExistingServiceFunctionCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.bin
deleted file mode 100644
index aaab888fa8b8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610866806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063b861a74014610046578063bc2fb00e146100aa578063c6dbffca1461010e575b600080fd5b6100a86004803603604081101561005c57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610172565b005b61010c600480360360408110156100c057600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610201565b005b6101706004803603604081101561012457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610294565b005b600061017e8383610323565b60070b9050601660030b81146101fc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f546f6b656e206b7963206772616e74206661696c65642100000000000000000081525060200191505060405180910390fd5b505050565b60008061020e84846104ca565b915060070b9150601660030b821461028e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f546f6b656e2069734b7963206661696c6564210000000000000000000000000081525060200191505060405180910390fd5b50505050565b60006102a08383610689565b60070b9050601660030b811461031e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f546f6b656e206b7963207265766f6b65206661696c656421000000000000000081525060200191505060405180910390fd5b505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8686604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061041e57805182526020820191506020810190506020830392506103fb565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610480576040519150601f19603f3d011682016040523d82523d6000602084013e610485565b606091505b5091509150816104965760156104bd565b8080602001905160208110156104ab57600080fd5b81019080805190602001909291905050505b60030b9250505092915050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663f2c31ff460e01b8787604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106105c757805182526020820191506020810190506020830392506105a4565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610629576040519150601f19603f3d011682016040523d82523d6000602084013e61062e565b606091505b5091509150816106415760156000610672565b80806020019051604081101561065657600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b9150809450819550505050509250929050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b8686604051602401808373ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff16815260200192505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106107845780518252602082019150602081019050602083039250610761565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146107e6576040519150601f19603f3d011682016040523d82523d6000602084013e6107eb565b606091505b5091509150816107fc576015610823565b80806020019051602081101561081157600080fd5b81019080805190602001909291905050505b60030b925050509291505056fea26469706673582212206e260cef5ea249919e9ff488492e90d3eb85b4eba177b528a18ad09adce3681664736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.json
deleted file mode 100644
index 28d091d6b9b9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKycGranted",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "tokenGrantKyc",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "tokenRevokeKyc",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.bin
deleted file mode 100644
index 5952f5ec8df7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610215806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806349c4176a146100465780636e366c961461008857806379ae45a5146100b6575b600080fd5b6100726004803603602081101561005c57600080fd5b81019080803590602001909291905050506100e4565b6040518082815260200191505060405180910390f35b6100b46004803603602081101561009e57600080fd5b8101908080359060200190929190505050610105565b005b6100e2600480360360208110156100cc57600080fd5b8101908080359060200190929190505050610125565b005b600081815481106100f157fe5b906000526020600020016000915090505481565b80600060018154811061011457fe5b906000526020600020018190555050565b600080805490509050600060108302905081811161014257600080fd5b80600081610150919061018f565b5060008290505b818110156101895760016000828154811061016e57fe5b90600052602060002001819055508080600101915050610157565b50505050565b8154818355818111156101b6578183600052602060002091820191016101b591906101bb565b5b505050565b6101dd91905b808211156101d95760008160009055506001016101c1565b5090565b9056fea265627a7a72315820a8e59fdb140e573eaaf517d41d25fc1edf6a476b6d62163e02032aea51da45ce64736f6c634300050b0032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.json b/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.json
deleted file mode 100644
index c05234f7064b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "bigArray",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "changeArray",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_limit",
-        "type": "uint256"
-      }
-    ],
-    "name": "growTo",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.bin
deleted file mode 100644
index 21ed9afa5a8e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b506103418061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061003f575f3560e01c80630a754de6146100435780634d8fdd6d146100615780635c9217e01461007f575b5f80fd5b61004b61009d565b6040516100589190610211565b60405180910390f35b610069610111565b6040516100769190610244565b60405180910390f35b610087610185565b6040516100949190610211565b60405180910390f35b5f3073ffffffffffffffffffffffffffffffffffffffff16630a754de66040518163ffffffff1660e01b81526004016020604051808303815f875af11580156100e8573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061010c919061028b565b905090565b5f3073ffffffffffffffffffffffffffffffffffffffff16634d8fdd6d6040518163ffffffff1660e01b81526004016020604051808303815f875af115801561015c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061018091906102e0565b905090565b5f3073ffffffffffffffffffffffffffffffffffffffff16635c9217e06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156101d0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101f4919061028b565b905090565b5f819050919050565b61020b816101f9565b82525050565b5f6020820190506102245f830184610202565b92915050565b5f8115159050919050565b61023e8161022a565b82525050565b5f6020820190506102575f830184610235565b92915050565b5f80fd5b61026a816101f9565b8114610274575f80fd5b50565b5f8151905061028581610261565b92915050565b5f602082840312156102a05761029f61025d565b5b5f6102ad84828501610277565b91505092915050565b6102bf8161022a565b81146102c9575f80fd5b50565b5f815190506102da816102b6565b92915050565b5f602082840312156102f5576102f461025d565b5b5f610302848285016102cc565b9150509291505056fea2646970667358221220737118360c5c8b7a3ed222a5f4efb1f4de186599c27b29b5b895492c102703df64736f6c634300081a0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.json
deleted file mode 100644
index 90766dde1425..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-    {
-        "inputs": [],
-        "name": "associate",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "responseCode",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "dissociate",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "responseCode",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "isAssociated",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "associated",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.bin
deleted file mode 100644
index a20ff384a0aa..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610e40806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80636ead04ef1461005157806393745ff8146100815780639f5c5dbe146100b2578063a3b7bc10146100ce575b600080fd5b61006b60048036038101906100669190610712565b6100fe565b6040516100789190610781565b60405180910390f35b61009b6004803603810190610096919061079c565b61015d565b6040516100a99291906107eb565b60405180910390f35b6100cc60048036038101906100c79190610712565b6101c2565b005b6100e860048036038101906100e3919061095a565b610309565b6040516100f59190610a00565b60405180910390f35b600061010b84848461031f565b9050601660030b8160070b14610156576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161014d90610a78565b60405180910390fd5b9392505050565b60008061016a848461043a565b8092508193505050601660030b8260070b146101bb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101b290610ae4565b60405180910390fd5b9250929050565b60008061016a73ffffffffffffffffffffffffffffffffffffffff168585856040516024016101f393929190610b13565b6040516020818303038152906040527f6ead04ef000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161027d9190610bbb565b600060405180830381855af49150503d80600081146102b8576040519150601f19603f3d011682016040523d82523d6000602084013e6102bd565b606091505b509150915081610302576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102f990610c1e565b60405180910390fd5b5050505050565b600061031684848461055f565b90509392505050565b600080600061016a73ffffffffffffffffffffffffffffffffffffffff1663a091846460e01b87878760405160240161035a93929190610b13565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103c49190610bbb565b6000604051808303816000865af19150503d8060008114610401576040519150601f19603f3d011682016040523d82523d6000602084013e610406565b606091505b50915091508161041757601561042c565b8080602001905181019061042b9190610c77565b5b60030b925050509392505050565b60008060008061016a73ffffffffffffffffffffffffffffffffffffffff1663fec4666660e01b8787604051602401610474929190610ca4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104de9190610bbb565b6000604051808303816000865af19150503d806000811461051b576040519150601f19603f3d011682016040523d82523d6000602084013e610520565b606091505b5091509150816105335760156000610548565b808060200190518101906105479190610ce2565b5b8160030b9150809450819550505050509250929050565b600080600061016a73ffffffffffffffffffffffffffffffffffffffff1663b2a31da460e01b87878760405160240161059a93929190610d6c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106049190610bbb565b6000604051808303816000865af19150503d8060008114610641576040519150601f19603f3d011682016040523d82523d6000602084013e610646565b606091505b50915091508080602001905181019061065f9190610ddd565b925050509392505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006106a98261067e565b9050919050565b6106b98161069e565b81146106c457600080fd5b50565b6000813590506106d6816106b0565b92915050565b6000819050919050565b6106ef816106dc565b81146106fa57600080fd5b50565b60008135905061070c816106e6565b92915050565b60008060006060848603121561072b5761072a610674565b5b6000610739868287016106c7565b935050602061074a868287016106c7565b925050604061075b868287016106fd565b9150509250925092565b60008160070b9050919050565b61077b81610765565b82525050565b60006020820190506107966000830184610772565b92915050565b600080604083850312156107b3576107b2610674565b5b60006107c1858286016106c7565b92505060206107d2858286016106c7565b9150509250929050565b6107e5816106dc565b82525050565b60006040820190506108006000830185610772565b61080d60208301846107dc565b9392505050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6108678261081e565b810181811067ffffffffffffffff821117156108865761088561082f565b5b80604052505050565b600061089961066a565b90506108a5828261085e565b919050565b600067ffffffffffffffff8211156108c5576108c461082f565b5b6108ce8261081e565b9050602081019050919050565b82818337600083830152505050565b60006108fd6108f8846108aa565b61088f565b90508281526020810184848401111561091957610918610819565b5b6109248482856108db565b509392505050565b600082601f83011261094157610940610814565b5b81356109518482602086016108ea565b91505092915050565b60008060006060848603121561097357610972610674565b5b6000610981868287016106c7565b935050602084013567ffffffffffffffff8111156109a2576109a1610679565b5b6109ae8682870161092c565b925050604084013567ffffffffffffffff8111156109cf576109ce610679565b5b6109db8682870161092c565b9150509250925092565b60008115159050919050565b6109fa816109e5565b82525050565b6000602082019050610a1560008301846109f1565b92915050565b600082825260208201905092915050565b7f4862617220617070726f7665206661696c656400000000000000000000000000600082015250565b6000610a62601383610a1b565b9150610a6d82610a2c565b602082019050919050565b60006020820190508181036000830152610a9181610a55565b9050919050565b7f4862617220616c6c6f77616e6365206661696c65640000000000000000000000600082015250565b6000610ace601583610a1b565b9150610ad982610a98565b602082019050919050565b60006020820190508181036000830152610afd81610ac1565b9050919050565b610b0d8161069e565b82525050565b6000606082019050610b286000830186610b04565b610b356020830185610b04565b610b4260408301846107dc565b949350505050565b600081519050919050565b600081905092915050565b60005b83811015610b7e578082015181840152602081019050610b63565b60008484015250505050565b6000610b9582610b4a565b610b9f8185610b55565b9350610baf818560208601610b60565b80840191505092915050565b6000610bc78284610b8a565b915081905092915050565b7f68626172417070726f76652829204661696c6564204173204578706563746564600082015250565b6000610c08602083610a1b565b9150610c1382610bd2565b602082019050919050565b60006020820190508181036000830152610c3781610bfb565b9050919050565b60008160030b9050919050565b610c5481610c3e565b8114610c5f57600080fd5b50565b600081519050610c7181610c4b565b92915050565b600060208284031215610c8d57610c8c610674565b5b6000610c9b84828501610c62565b91505092915050565b6000604082019050610cb96000830185610b04565b610cc66020830184610b04565b9392505050565b600081519050610cdc816106e6565b92915050565b60008060408385031215610cf957610cf8610674565b5b6000610d0785828601610c62565b9250506020610d1885828601610ccd565b9150509250929050565b600082825260208201905092915050565b6000610d3e82610b4a565b610d488185610d22565b9350610d58818560208601610b60565b610d618161081e565b840191505092915050565b6000606082019050610d816000830186610b04565b8181036020830152610d938185610d33565b90508181036040830152610da78184610d33565b9050949350505050565b610dba816109e5565b8114610dc557600080fd5b50565b600081519050610dd781610db1565b92915050565b600060208284031215610df357610df2610674565b5b6000610e0184828501610dc8565b9150509291505056fea26469706673582212204c8a4913080657ef9e4b797bb948748424ed35dd4a1f6dee0db76105be58123d64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.json
deleted file mode 100644
index 8b32b7821c70..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"spender","type":"address"}],"name":"hbarAllowanceCall","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"int256","name":"amount","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"spender","type":"address"},{"internalType":"int256","name":"amount","type":"int256"}],"name":"hbarApproveCall","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"spender","type":"address"},{"internalType":"int256","name":"amount","type":"int256"}],"name":"hbarApproveDelegateCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"bytes","name":"messageHash","type":"bytes"},{"internalType":"bytes","name":"signature","type":"bytes"}],"name":"isAuthorizedRawCall","outputs":[{"internalType":"bool","name":"result","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.bin
deleted file mode 100644
index 6e72274d3281..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b506104028061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061003f575f3560e01c8063322e355014610043578063d55fe58214610073578063d89f3123146100a3575b5f80fd5b61005d60048036038101906100589190610293565b6100d3565b60405161006a91906102d6565b60405180910390f35b61008d60048036038101906100889190610293565b610149565b60405161009a9190610309565b60405180910390f35b6100bd60048036038101906100b89190610293565b6101bf565b6040516100ca91906102d6565b60405180910390f35b5f8173ffffffffffffffffffffffffffffffffffffffff16635c9217e06040518163ffffffff1660e01b81526004016020604051808303815f875af115801561011e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610142919061034c565b9050919050565b5f8173ffffffffffffffffffffffffffffffffffffffff16634d8fdd6d6040518163ffffffff1660e01b81526004016020604051808303815f875af1158015610194573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101b891906103a1565b9050919050565b5f8173ffffffffffffffffffffffffffffffffffffffff16630a754de66040518163ffffffff1660e01b81526004016020604051808303815f875af115801561020a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022e919061034c565b9050919050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61026282610239565b9050919050565b61027281610258565b811461027c575f80fd5b50565b5f8135905061028d81610269565b92915050565b5f602082840312156102a8576102a7610235565b5b5f6102b58482850161027f565b91505092915050565b5f819050919050565b6102d0816102be565b82525050565b5f6020820190506102e95f8301846102c7565b92915050565b5f8115159050919050565b610303816102ef565b82525050565b5f60208201905061031c5f8301846102fa565b92915050565b61032b816102be565b8114610335575f80fd5b50565b5f8151905061034681610322565b92915050565b5f6020828403121561036157610360610235565b5b5f61036e84828501610338565b91505092915050565b610380816102ef565b811461038a575f80fd5b50565b5f8151905061039b81610377565b92915050565b5f602082840312156103b6576103b5610235565b5b5f6103c38482850161038d565b9150509291505056fea264697066735822122068e6496c973715315344bc411b8c0fa358b45296d0edc0b854cc358c7fff901564736f6c634300081a0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.json
deleted file mode 100644
index 252dfbb4e5b9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "token",
-                "type": "address"
-            }
-        ],
-        "name": "associate",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "responseCode",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "token",
-                "type": "address"
-            }
-        ],
-        "name": "dissociate",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "responseCode",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "token",
-                "type": "address"
-            }
-        ],
-        "name": "isAssociated",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "associated",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.bin
deleted file mode 100644
index c9c73707e94a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610fcd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80636268fe9e14610046578063d998e94514610076578063e235ad1f146100a8575b600080fd5b610060600480360381019061005b9190610734565b6100d9565b60405161006d9190610c42565b60405180910390f35b610090600480360381019061008b9190610797565b6100f1565b60405161009f93929190610c86565b60405180910390f35b6100c260048036038101906100bd91906107fe565b610110565b6040516100d0929190610c5d565b60405180910390f35b60006100e78585858561012a565b9050949350505050565b6000806060610101868686610248565b92509250925093509350939050565b60008061011e8585856103bf565b91509150935093915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016101679493929190610b81565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101d19190610b6a565b6000604051808303816000865af19150503d806000811461020e576040519150601f19603f3d011682016040523d82523d6000602084013e610213565b606091505b509150915081610224576015610239565b808060200190518101906102389190610865565b5b60030b92505050949350505050565b60008060606000606061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161028793929190610bc6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102f19190610b6a565b6000604051808303816000865af19150503d806000811461032e576040519150601f19603f3d011682016040523d82523d6000602084013e610333565b606091505b50915091508161038d57601560008067ffffffffffffffff8111801561035857600080fd5b506040519080825280602002602001820160405280156103875781602001602082028036833780820191505090505b506103a2565b808060200190518101906103a191906108ca565b5b8260030b9250809550819650829750505050505093509350939050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8888886040516024016103fc93929190610c04565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104669190610b6a565b6000604051808303816000865af19150503d80600081146104a3576040519150601f19603f3d011682016040523d82523d6000602084013e6104a8565b606091505b5091509150816104bb57601560006104d0565b808060200190518101906104cf919061088e565b5b8160030b915080945081955050505050935093915050565b6000813590506104f781610f24565b92915050565b600082601f83011261050e57600080fd5b813561052161051c82610cf1565b610cc4565b9150818183526020840193506020810190508360005b83811015610567578135860161054d8882610677565b845260208401935060208301925050600181019050610537565b5050505092915050565b600082601f83011261058257600080fd5b815161059561059082610d19565b610cc4565b915081818352602084019350602081019050838560208402820111156105ba57600080fd5b60005b838110156105ea57816105d088826106cb565b8452602084019350602083019250506001810190506105bd565b5050505092915050565b600082601f83011261060557600080fd5b813561061861061382610d41565b610cc4565b9150818183526020840193506020810190508385602084028201111561063d57600080fd5b60005b8381101561066d578161065388826106f5565b845260208401935060208301925050600181019050610640565b5050505092915050565b600082601f83011261068857600080fd5b813561069b61069682610d69565b610cc4565b915080825260208301602083018583830111156106b757600080fd5b6106c2838284610ed1565b50505092915050565b6000815190506106da81610f3b565b92915050565b6000815190506106ef81610f52565b92915050565b60008135905061070481610f69565b92915050565b60008135905061071981610f80565b92915050565b60008151905061072e81610f80565b92915050565b6000806000806080858703121561074a57600080fd5b6000610758878288016104e8565b9450506020610769878288016104e8565b935050604061077a878288016104e8565b925050606061078b878288016106f5565b91505092959194509250565b6000806000606084860312156107ac57600080fd5b60006107ba868287016104e8565b93505060206107cb8682870161070a565b925050604084013567ffffffffffffffff8111156107e857600080fd5b6107f4868287016104fd565b9150509250925092565b60008060006060848603121561081357600080fd5b6000610821868287016104e8565b93505060206108328682870161070a565b925050604084013567ffffffffffffffff81111561084f57600080fd5b61085b868287016105f4565b9150509250925092565b60006020828403121561087757600080fd5b6000610885848285016106e0565b91505092915050565b600080604083850312156108a157600080fd5b60006108af858286016106e0565b92505060206108c08582860161071f565b9150509250929050565b6000806000606084860312156108df57600080fd5b60006108ed868287016106e0565b93505060206108fe8682870161071f565b925050604084015167ffffffffffffffff81111561091b57600080fd5b61092786828701610571565b9150509250925092565b600061093d8383610ab5565b905092915050565b60006109518383610b1f565b60208301905092915050565b60006109698383610b3d565b60208301905092915050565b61097e81610e67565b82525050565b600061098f82610dc5565b6109998185610e18565b9350836020820285016109ab85610d95565b8060005b858110156109e757848403895281516109c88582610931565b94506109d383610df1565b925060208a019950506001810190506109af565b50829750879550505050505092915050565b6000610a0482610dd0565b610a0e8185610e29565b9350610a1983610da5565b8060005b83811015610a4a578151610a318882610945565b9750610a3c83610dfe565b925050600181019050610a1d565b5085935050505092915050565b6000610a6282610ddb565b610a6c8185610e3a565b9350610a7783610db5565b8060005b83811015610aa8578151610a8f888261095d565b9750610a9a83610e0b565b925050600181019050610a7b565b5085935050505092915050565b6000610ac082610de6565b610aca8185610e4b565b9350610ada818560208601610ee0565b610ae381610f13565b840191505092915050565b6000610af982610de6565b610b038185610e5c565b9350610b13818560208601610ee0565b80840191505092915050565b610b2881610e79565b82525050565b610b3781610e79565b82525050565b610b4681610e90565b82525050565b610b5581610e90565b82525050565b610b6481610ebd565b82525050565b6000610b768284610aee565b915081905092915050565b6000608082019050610b966000830187610975565b610ba36020830186610975565b610bb06040830185610975565b610bbd6060830184610b4c565b95945050505050565b6000606082019050610bdb6000830186610975565b610be86020830185610b5b565b8181036040830152610bfa8184610984565b9050949350505050565b6000606082019050610c196000830186610975565b610c266020830185610b5b565b8181036040830152610c388184610a57565b9050949350505050565b6000602082019050610c576000830184610b2e565b92915050565b6000604082019050610c726000830185610b2e565b610c7f6020830184610b5b565b9392505050565b6000606082019050610c9b6000830186610b2e565b610ca86020830185610b5b565b8181036040830152610cba81846109f9565b9050949350505050565b6000604051905081810181811067ffffffffffffffff82111715610ce757600080fd5b8060405250919050565b600067ffffffffffffffff821115610d0857600080fd5b602082029050602081019050919050565b600067ffffffffffffffff821115610d3057600080fd5b602082029050602081019050919050565b600067ffffffffffffffff821115610d5857600080fd5b602082029050602081019050919050565b600067ffffffffffffffff821115610d8057600080fd5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b6000610e7282610e9d565b9050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b82818337600083830152505050565b60005b83811015610efe578082015181840152602081019050610ee3565b83811115610f0d576000848401525b50505050565b6000601f19601f8301169050919050565b610f2d81610e67565b8114610f3857600080fd5b50565b610f4481610e79565b8114610f4f57600080fd5b50565b610f5b81610e83565b8114610f6657600080fd5b50565b610f7281610e90565b8114610f7d57600080fd5b50565b610f8981610ebd565b8114610f9457600080fd5b5056fea264697066735822122078b2b1a2e4dcfa5b1c9e2aa303f5df1e729045234bd36220565ab3684b93f47664736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.json
deleted file mode 100644
index 7b458e904212..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.json
+++ /dev/null
@@ -1,109 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnTokenCall",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenCall",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int256[]",
-        "name": "serialNumbers",
-        "type": "int256[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "transferNFTCall",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.bin
deleted file mode 100644
index c6db4220e3e5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610733380380610733833981810160405281019061003291906100db565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610108565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a88261007d565b9050919050565b6100b88161009d565b81146100c357600080fd5b50565b6000815190506100d5816100af565b92915050565b6000602082840312156100f1576100f0610078565b5b60006100ff848285016100c6565b91505092915050565b61061c806101176000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637c41ad2c1461003b578063bb02b5811461006b575b600080fd5b610055600480360381019061005091906102df565b610087565b6040516100629190610325565b60405180910390f35b610085600480360381019061008091906103ed565b61019c565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100be9190610489565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101289190610515565b6000604051808303816000865af19150503d8060008114610165576040519150601f19603f3d011682016040523d82523d6000602084013e61016a565b606091505b50915091508161017b576015610190565b8080602001905181019061018f9190610565565b5b60030b92505050919050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663a50b36a5878787866040518563ffffffff1660e01b81526004016101fb94939291906105a1565b600060405180830381600087803b15801561021557600080fd5b505af1158015610229573d6000803e3d6000fd5b505050508273ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610273573d6000803e3d6000fd5b50505050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102ac82610281565b9050919050565b6102bc816102a1565b81146102c757600080fd5b50565b6000813590506102d9816102b3565b92915050565b6000602082840312156102f5576102f461027c565b5b6000610303848285016102ca565b91505092915050565b6000819050919050565b61031f8161030c565b82525050565b600060208201905061033a6000830184610316565b92915050565b600061034b82610281565b9050919050565b61035b81610340565b811461036657600080fd5b50565b60008135905061037881610352565b92915050565b60008160070b9050919050565b6103948161037e565b811461039f57600080fd5b50565b6000813590506103b18161038b565b92915050565b6000819050919050565b6103ca816103b7565b81146103d557600080fd5b50565b6000813590506103e7816103c1565b92915050565b60008060008060008060c0878903121561040a5761040961027c565b5b600061041889828a016102ca565b965050602061042989828a016102ca565b955050604061043a89828a016102ca565b945050606061044b89828a01610369565b935050608061045c89828a016103a2565b92505060a061046d89828a016103d8565b9150509295509295509295565b610483816102a1565b82525050565b600060208201905061049e600083018461047a565b92915050565b600081519050919050565b600081905092915050565b60005b838110156104d85780820151818401526020810190506104bd565b60008484015250505050565b60006104ef826104a4565b6104f981856104af565b93506105098185602086016104ba565b80840191505092915050565b600061052182846104e4565b915081905092915050565b60008160030b9050919050565b6105428161052c565b811461054d57600080fd5b50565b60008151905061055f81610539565b92915050565b60006020828403121561057b5761057a61027c565b5b600061058984828501610550565b91505092915050565b61059b8161037e565b82525050565b60006080820190506105b6600083018761047a565b6105c3602083018661047a565b6105d0604083018561047a565b6105dd6060830184610592565b9594505050505056fea26469706673582212203a1687d53e5f7eeef77b2f338cda99dadb3b583115209ca1c90ffd1117ce871064736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.json
deleted file mode 100644
index da8146feab2a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.json
+++ /dev/null
@@ -1,70 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "transferrerContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_tokenReceiver",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_hbarReceiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "_tokenAmount",
-        "type": "int64"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_hbarAmount",
-        "type": "uint256"
-      }
-    ],
-    "name": "feeDistributionAfterTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.bin
deleted file mode 100644
index 820de3c7a7af..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610951380380610951833981810160405281019061003291906100db565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610108565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a88261007d565b9050919050565b6100b88161009d565b81146100c357600080fd5b50565b6000815190506100d5816100af565b92915050565b6000602082840312156100f1576100f0610078565b5b60006100ff848285016100c6565b91505092915050565b61083a806101176000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80631249c58b1461003b578063a934606014610045575b600080fd5b610043610061565b005b61005f600480360381019061005a9190610369565b6100f8565b005b60008060006100e060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff166000600167ffffffffffffffff8111156100a7576100a6610396565b5b6040519080825280602002602001820160405280156100da57816020015b60608152602001906001900390816100c55790505b5061019d565b925092509250601683146100f357600080fd5b505050565b600080600061017660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1685600067ffffffffffffffff81111561013d5761013c610396565b5b60405190808252806020026020018201604052801561017057816020015b606081526020019060019003908161015b5790505b5061019d565b92509250925060168314158061018d575060008151115b1561019757600080fd5b50505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016101db93929190610567565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161024591906105e1565b6000604051808303816000865af19150503d8060008114610282576040519150601f19603f3d011682016040523d82523d6000602084013e610287565b606091505b5091509150816102e357601560008067ffffffffffffffff8111156102af576102ae610396565b5b6040519080825280602002602001820160405280156102dd5781602001602082028036833780820191505090505b506102f8565b808060200190518101906102f79190610795565b5b8260030b9250809550819650829750505050505093509350939050565b6000604051905090565b600080fd5b600080fd5b600067ffffffffffffffff82169050919050565b61034681610329565b811461035157600080fd5b50565b6000813590506103638161033d565b92915050565b60006020828403121561037f5761037e61031f565b5b600061038d84828501610354565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103f0826103c5565b9050919050565b610400816103e5565b82525050565b61040f81610329565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561047b578082015181840152602081019050610460565b60008484015250505050565b6000601f19601f8301169050919050565b60006104a382610441565b6104ad818561044c565b93506104bd81856020860161045d565b6104c681610487565b840191505092915050565b60006104dd8383610498565b905092915050565b6000602082019050919050565b60006104fd82610415565b6105078185610420565b93508360208202850161051985610431565b8060005b85811015610555578484038952815161053685826104d1565b9450610541836104e5565b925060208a0199505060018101905061051d565b50829750879550505050505092915050565b600060608201905061057c60008301866103f7565b6105896020830185610406565b818103604083015261059b81846104f2565b9050949350505050565b600081905092915050565b60006105bb82610441565b6105c581856105a5565b93506105d581856020860161045d565b80840191505092915050565b60006105ed82846105b0565b915081905092915050565b60008160030b9050919050565b61060e816105f8565b811461061957600080fd5b50565b60008151905061062b81610605565b92915050565b6000815190506106408161033d565b92915050565b600080fd5b61065482610487565b810181811067ffffffffffffffff8211171561067357610672610396565b5b80604052505050565b6000610686610315565b9050610692828261064b565b919050565b600067ffffffffffffffff8211156106b2576106b1610396565b5b602082029050602081019050919050565b600080fd5b6000819050919050565b6106db816106c8565b81146106e657600080fd5b50565b6000815190506106f8816106d2565b92915050565b600061071161070c84610697565b61067c565b90508083825260208201905060208402830185811115610734576107336106c3565b5b835b8181101561075d578061074988826106e9565b845260208401935050602081019050610736565b5050509392505050565b600082601f83011261077c5761077b610646565b5b815161078c8482602086016106fe565b91505092915050565b6000806000606084860312156107ae576107ad61031f565b5b60006107bc8682870161061c565b93505060206107cd86828701610631565b925050604084015167ffffffffffffffff8111156107ee576107ed610324565b5b6107fa86828701610767565b915050925092509256fea26469706673582212207240347112be41e9c2bad1ebaa88c96d8a5402bd84b71c8ea38516eda37a977464736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.json
deleted file mode 100644
index 67607d987934..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      }
-    ],
-    "name": "brrr",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "mint",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.bin
deleted file mode 100644
index 12138fd97c9d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610471806100206000396000f3fe60806040526004361061001e5760003560e01c80632799b47d14610023575b600080fd5b61003d60048036038101906100389190610219565b61003f565b005b6000808373ffffffffffffffffffffffffffffffffffffffff16348490607b60405160240161006e9190610308565b6040516020818303038152906040527f24ccab8f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516100f891906103a7565b600060405180830381858888f193505050503d8060008114610136576040519150601f19603f3d011682016040523d82523d6000602084013e61013b565b606091505b50915091508115157f13848c3e38f8886f3f5d2ad9dff80d8092c2bbb8efd5b887a99c2c6cfc09ac2a826040516101729190610419565b60405180910390a250505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101b082610185565b9050919050565b6101c0816101a5565b81146101cb57600080fd5b50565b6000813590506101dd816101b7565b92915050565b6000819050919050565b6101f6816101e3565b811461020157600080fd5b50565b600081359050610213816101ed565b92915050565b600080604083850312156102305761022f610180565b5b600061023e858286016101ce565b925050602061024f85828601610204565b9150509250929050565b600082825260208201905092915050565b7f63616c6c20666f6f000000000000000000000000000000000000000000000000600082015250565b60006102a0600883610259565b91506102ab8261026a565b602082019050919050565b6000819050919050565b600060ff82169050919050565b6000819050919050565b60006102f26102ed6102e8846102b6565b6102cd565b6102c0565b9050919050565b610302816102d7565b82525050565b6000604082019050818103600083015261032181610293565b905061033060208301846102f9565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561036a57808201518184015260208101905061034f565b60008484015250505050565b600061038182610336565b61038b8185610341565b935061039b81856020860161034c565b80840191505092915050565b60006103b38284610376565b915081905092915050565b600082825260208201905092915050565b6000601f19601f8301169050919050565b60006103eb82610336565b6103f581856103be565b935061040581856020860161034c565b61040e816103cf565b840191505092915050565b6000602082019050818103600083015261043381846103e0565b90509291505056fea2646970667358221220439c21f3217e4cedf01b5af58016d806e5c74e382565b0f0aab88735a2d26fd064736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.json
deleted file mode 100644
index 57f32e04bc59..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"success","type":"bool"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"Response","type":"event"},{"inputs":[{"internalType":"address payable","name":"_addr","type":"address"},{"internalType":"uint256","name":"gasLimit","type":"uint256"}],"name":"testCallFoo","outputs":[],"stateMutability":"payable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.bin
deleted file mode 100644
index 232b549ac9bf..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610e62806100206000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c80631ae1e7be146100675780632e55e1d6146100975780635c40f557146100c75780639cba3cdc146100f7578063bfad3db014610127578063d89583ad14610157575b600080fd5b610081600480360381019061007c919061091a565b610187565b60405161008e9190610988565b60405180910390f35b6100b160048036038101906100ac91906109d9565b6101a5565b6040516100be9190610a28565b60405180910390f35b6100e160048036038101906100dc9190610a6f565b6101c1565b6040516100ee9190610988565b60405180910390f35b610111600480360381019061010c919061091a565b6101dd565b60405161011e9190610ad1565b60405180910390f35b610141600480360381019061013c9190610aec565b6101fb565b60405161014e9190610988565b60405180910390f35b610171600480360381019061016c9190610aec565b610217565b60405161017e9190610988565b60405180910390f35b60008061019585858561030c565b8093508192505050509392505050565b6000806101b28484610434565b80935081925050505092915050565b6000601660030b6101d3858585610559565b1490509392505050565b6000806101eb858585610674565b8093508192505050509392505050565b6000601660030b61020d85858561079c565b1490509392505050565b6000606061016773ffffffffffffffffffffffffffffffffffffffff16637336aaf060e01b86868660405160240161025193929190610b3f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102bb9190610bf0565b600060405180830381855af49150503d80600081146102f6576040519150601f19603f3d011682016040523d82523d6000602084013e6102fb565b606091505b508092508193505050509392505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663f49f40db60e01b88888860405160240161034893929190610c07565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103b29190610bf0565b6000604051808303816000865af19150503d80600081146103ef576040519150601f19603f3d011682016040523d82523d6000602084013e6103f4565b606091505b509150915081610407576015600061041c565b8080602001905181019061041b9190610c8c565b5b8160030b915080945081955050505050935093915050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663098f236660e01b878760405160240161046e929190610ccc565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104d89190610bf0565b6000604051808303816000865af19150503d8060008114610515576040519150601f19603f3d011682016040523d82523d6000602084013e61051a565b606091505b50915091508161052d5760156000610542565b808060200190518101906105419190610d33565b5b8160030b9150809450819550505050509250929050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663367605ca60e01b87878760405160240161059493929190610d73565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105fe9190610bf0565b6000604051808303816000865af19150503d806000811461063b576040519150601f19603f3d011682016040523d82523d6000602084013e610640565b606091505b509150915081610651576015610666565b808060200190518101906106659190610daa565b5b60030b925050509392505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663927da10560e01b8888886040516024016106b093929190610c07565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161071a9190610bf0565b6000604051808303816000865af19150503d8060008114610757576040519150601f19603f3d011682016040523d82523d6000602084013e61075c565b606091505b50915091508161076f5760156000610784565b808060200190518101906107839190610dec565b5b8160030b915080945081955050505050935093915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b8787876040516024016107d793929190610b3f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108419190610bf0565b6000604051808303816000865af19150503d806000811461087e576040519150601f19603f3d011682016040523d82523d6000602084013e610883565b606091505b5091509150816108945760156108a9565b808060200190518101906108a89190610daa565b5b60030b925050509392505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006108e7826108bc565b9050919050565b6108f7816108dc565b811461090257600080fd5b50565b600081359050610914816108ee565b92915050565b600080600060608486031215610933576109326108b7565b5b600061094186828701610905565b935050602061095286828701610905565b925050604061096386828701610905565b9150509250925092565b60008115159050919050565b6109828161096d565b82525050565b600060208201905061099d6000830184610979565b92915050565b6000819050919050565b6109b6816109a3565b81146109c157600080fd5b50565b6000813590506109d3816109ad565b92915050565b600080604083850312156109f0576109ef6108b7565b5b60006109fe85828601610905565b9250506020610a0f858286016109c4565b9150509250929050565b610a22816108dc565b82525050565b6000602082019050610a3d6000830184610a19565b92915050565b610a4c8161096d565b8114610a5757600080fd5b50565b600081359050610a6981610a43565b92915050565b600080600060608486031215610a8857610a876108b7565b5b6000610a9686828701610905565b9350506020610aa786828701610905565b9250506040610ab886828701610a5a565b9150509250925092565b610acb816109a3565b82525050565b6000602082019050610ae66000830184610ac2565b92915050565b600080600060608486031215610b0557610b046108b7565b5b6000610b1386828701610905565b9350506020610b2486828701610905565b9250506040610b35868287016109c4565b9150509250925092565b6000606082019050610b546000830186610a19565b610b616020830185610a19565b610b6e6040830184610ac2565b949350505050565b600081519050919050565b600081905092915050565b60005b83811015610baa578082015181840152602081019050610b8f565b83811115610bb9576000848401525b50505050565b6000610bca82610b76565b610bd48185610b81565b9350610be4818560208601610b8c565b80840191505092915050565b6000610bfc8284610bbf565b915081905092915050565b6000606082019050610c1c6000830186610a19565b610c296020830185610a19565b610c366040830184610a19565b949350505050565b60008160030b9050919050565b610c5481610c3e565b8114610c5f57600080fd5b50565b600081519050610c7181610c4b565b92915050565b600081519050610c8681610a43565b92915050565b60008060408385031215610ca357610ca26108b7565b5b6000610cb185828601610c62565b9250506020610cc285828601610c77565b9150509250929050565b6000604082019050610ce16000830185610a19565b610cee6020830184610ac2565b9392505050565b6000610d00826108bc565b9050919050565b610d1081610cf5565b8114610d1b57600080fd5b50565b600081519050610d2d81610d07565b92915050565b60008060408385031215610d4a57610d496108b7565b5b6000610d5885828601610c62565b9250506020610d6985828601610d1e565b9150509250929050565b6000606082019050610d886000830186610a19565b610d956020830185610a19565b610da26040830184610979565b949350505050565b600060208284031215610dc057610dbf6108b7565b5b6000610dce84828501610c62565b91505092915050565b600081519050610de6816109ad565b92915050565b60008060408385031215610e0357610e026108b7565b5b6000610e1185828601610c62565b9250506020610e2285828601610dd7565b915050925092905056fea26469706673582212200be0cf14803dde062b4dfea27a0147cbec4f129868de6715e344ca531d24cc1964736f6c634300080e0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.json
deleted file mode 100644
index c676d5c0ee75..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.json
+++ /dev/null
@@ -1,171 +0,0 @@
-[
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "owner",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "spender",
-		"type": "address"
-	  }
-	],
-	"name": "htsAllowance",
-	"outputs": [
-	  {
-		"internalType": "uint256",
-		"name": "amount",
-		"type": "uint256"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  },
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "spender",
-		"type": "address"
-	  },
-	  {
-		"internalType": "uint256",
-		"name": "amount",
-		"type": "uint256"
-	  }
-	],
-	"name": "htsApprove",
-	"outputs": [
-	  {
-		"internalType": "bool",
-		"name": "success",
-		"type": "bool"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  },
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "spender",
-		"type": "address"
-	  },
-	  {
-		"internalType": "uint256",
-		"name": "amount",
-		"type": "uint256"
-	  }
-	],
-	"name": "htsApproveNFT",
-	"outputs": [
-	  {
-		"internalType": "bool",
-		"name": "success",
-		"type": "bool"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  },
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "uint256",
-		"name": "serialNumber",
-		"type": "uint256"
-	  }
-	],
-	"name": "htsGetApproved",
-	"outputs": [
-	  {
-		"internalType": "address",
-		"name": "approved",
-		"type": "address"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  },
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "owner",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "operator",
-		"type": "address"
-	  }
-	],
-	"name": "htsIsApprovedForAll",
-	"outputs": [
-	  {
-		"internalType": "bool",
-		"name": "approved",
-		"type": "bool"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  },
-  {
-	"inputs": [
-	  {
-		"internalType": "address",
-		"name": "token",
-		"type": "address"
-	  },
-	  {
-		"internalType": "address",
-		"name": "spender",
-		"type": "address"
-	  },
-	  {
-		"internalType": "bool",
-		"name": "approved",
-		"type": "bool"
-	  }
-	],
-	"name": "htsSetApprovalForAll",
-	"outputs": [
-	  {
-		"internalType": "bool",
-		"name": "success",
-		"type": "bool"
-	  }
-	],
-	"stateMutability": "nonpayable",
-	"type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.bin
deleted file mode 100644
index d464d140109b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506111e8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c80636fc3cbaf116100715780636fc3cbaf146101305780637c41ad2c146101565780638f8d7f9914610169578063af99c6331461017c578063d614cdb81461018f578063f2c31ff4146101b057600080fd5b806313a8ed53146100ae5780633b3bff0f146100c35780633c4dd32e146100e95780635081ded31461010a578063593d6e821461011d575b600080fd5b6100c16100bc36600461092b565b6101dd565b005b6100d66100d136600461097c565b610243565b6040519081526020015b60405180910390f35b6100fc6100f73660046109a0565b61031d565b6040516100e0929190610a93565b6100c161011836600461092b565b610404565b6100d661012b366004610b7f565b610412565b61014361013e366004610c88565b6104ef565b60405160079190910b81526020016100e0565b6100d661016436600461097c565b61051b565b610143610177366004610e49565b610549565b61014361018a366004610e49565b61057f565b6101a261019d36600461097c565b6105b5565b6040516100e0929190610e82565b6101c36101be366004610e49565b6106bf565b6040805160079390930b83529015156020830152016100e0565b60006101eb8585858561078a565b60070b90506016811461023c5760405162461bcd60e51b81526020600482015260156024820152745472616e736665722066726f6d206661696c65642160581b604482015260640160405180910390fd5b5050505050565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102ab9190610ebc565b6000604051808303816000865af19150503d80600081146102e8576040519150601f19603f3d011682016040523d82523d6000602084013e6102ed565b606091505b5091509150816102fe576015610312565b808060200190518101906103129190610eea565b60030b949350505050565b60006103276108c0565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b179052905160009182916101679161038191610ebc565b6000604051808303816000865af19150503d80600081146103be576040519150601f19603f3d011682016040523d82523d6000602084013e6103c3565b606091505b50915091506103d06108c0565b826103dd576015816103f1565b818060200190518101906103f19190610f55565b60039190910b9890975095505050505050565b60006101eb8585858561087b565b60008060006101676001600160a01b031663593d6e8260e01b868660405160240161043e929190611030565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161047c9190610ebc565b6000604051808303816000865af19150503d80600081146104b9576040519150601f19603f3d011682016040523d82523d6000602084013e6104be565b606091505b5091509150816104cf5760156104e3565b808060200190518101906104e39190610eea565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b868660405160240161043e929190611073565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b9060440161026d565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b9060640161043e565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b9060640161043e565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b1790529251909283918291610167916106279190610ebc565b6000604051808303816000865af19150503d8060008114610664576040519150601f19603f3d011682016040523d82523d6000602084013e610669565b606091505b506040805160608101825260008082526020820181905291810191909152919350915082610699576015816106ad565b818060200190518101906106ad91906110f8565b60039190910b97909650945050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b17905290516000918291829182916101679161072191610ebc565b6000604051808303816000865af19150503d806000811461075e576040519150601f19603f3d011682016040523d82523d6000602084013e610763565b606091505b50915091508161077657601560006106ad565b808060200190518101906106ad9190611163565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516108099190610ebc565b6000604051808303816000865af19150503d8060008114610846576040519150601f19603f3d011682016040523d82523d6000602084013e61084b565b606091505b50915091508161085c576015610870565b80806020019051810190610870919061118f565b979650505050505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a4016107cb565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001600160a01b038116811461091857600080fd5b50565b803561092681610903565b919050565b6000806000806080858703121561094157600080fd5b843561094c81610903565b9350602085013561095c81610903565b9250604085013561096c81610903565b9396929550929360600135925050565b60006020828403121561098e57600080fd5b813561099981610903565b9392505050565b600080604083850312156109b357600080fd5b82356109be81610903565b946020939093013593505050565b60005b838110156109e75781810151838201526020016109cf565b838111156109f6576000848401525b50505050565b60008151808452610a148160208601602086016109cc565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a06040860152610a6060a08601836109fc565b915060608401518583036060870152610a7983826109fc565b925050806080850151166080860152508091505092915050565b8260070b8152604060208201526000610aaf6040830184610a28565b949350505050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff81118282101715610af057610af0610ab7565b60405290565b6040805190810167ffffffffffffffff81118282101715610af057610af0610ab7565b60405160a0810167ffffffffffffffff81118282101715610af057610af0610ab7565b604051601f8201601f1916810167ffffffffffffffff81118282101715610b6557610b65610ab7565b604052919050565b63ffffffff8116811461091857600080fd5b6000808284036080811215610b9357600080fd5b8335610b9e81610903565b92506060601f1982011215610bb257600080fd5b50610bbb610acd565b6020840135610bc981610b6d565b81526040840135610bd981610903565b60208201526060840135610bec81610b6d565b6040820152919491935090915050565b801515811461091857600080fd5b600067ffffffffffffffff821115610c2457610c24610ab7565b50601f01601f191660200190565b600082601f830112610c4357600080fd5b8135610c56610c5182610c0a565b610b3c565b818152846020838601011115610c6b57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610c9b57600080fd5b610ca58335610903565b8235915067ffffffffffffffff8060208501351115610cc357600080fd5b6020840135840185601f820112610cd957600080fd5b8181351115610cea57610cea610ab7565b610cfa6020823560051b01610b3c565b81358082526020808301929160051b84010188811115610d1957600080fd5b602084015b81811015610e3a578581351115610d3457600080fd5b80358501601f196040828d0382011215610d4d57600080fd5b610d55610af6565b602083013581528860408401351115610d6d57600080fd5b60408301358301925060a082848f03011215610d8857600080fd5b610d90610b19565b9150610d9f6020840135610bfc565b60208301358252610db36040840135610903565b604083013560208301528860608401351115610dce57600080fd5b610de18d60206060860135860101610c32565b60408301528860808401351115610df757600080fd5b610e0a8d60206080860135860101610c32565b6060830152610e1b60a0840161091b565b6080830152602081810192909252865294850194919091019050610d1e565b50959890975095505050505050565b60008060408385031215610e5c57600080fd5b8235610e6781610903565b91506020830135610e7781610903565b809150509250929050565b828152608081016109996020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b60008251610ece8184602087016109cc565b9190910192915050565b8051600381900b811461092657600080fd5b600060208284031215610efc57600080fd5b61099982610ed8565b805161092681610903565b600082601f830112610f2157600080fd5b8151610f2f610c5182610c0a565b818152846020838601011115610f4457600080fd5b610aaf8260208301602087016109cc565b60008060408385031215610f6857600080fd5b610f7183610ed8565b9150602083015167ffffffffffffffff80821115610f8e57600080fd5b9084019060a08287031215610fa257600080fd5b610faa610b19565b8251610fb581610bfc565b81526020830151610fc581610903565b6020820152604083015182811115610fdc57600080fd5b610fe888828601610f10565b60408301525060608301518281111561100057600080fd5b61100c88828601610f10565b60608301525061101e60808401610f05565b60808201528093505050509250929050565b6001600160a01b0383168152608081016109996020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b828110156110e957888603605f190184528151805187528501518587018890526110d688880182610a28565b96505092840192908401906001016110aa565b50939998505050505050505050565b600080828403608081121561110c57600080fd5b61111584610ed8565b92506060601f198201121561112957600080fd5b50611132610acd565b602084015161114081610b6d565b8152604084015161115081610903565b60208201526060840151610bec81610b6d565b6000806040838503121561117657600080fd5b61117f83610ed8565b91506020830151610e7781610bfc565b6000602082840312156111a157600080fd5b81518060070b811461099957600080fdfea264697066735822122091d65c65eea99c9aa1608f18128074339d49b46d9f66af9108fa0c4e7d62d2a564736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.json b/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.json
deleted file mode 100644
index 8fe34cbc3639..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.json
+++ /dev/null
@@ -1,374 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "htsTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "htsTransferFromNFT",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.json b/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.json
deleted file mode 100644
index cfe9e8070875..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"spender","type":"address"}],"name":"hbarAllowance","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"int256","name":"allowance","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"spender","type":"address"},{"internalType":"int256","name":"amount","type":"int256"}],"name":"hbarApprove","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.bin
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.json b/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.json
deleted file mode 100644
index f41ec49e1566..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"spender","type":"address"}],"name":"allowance","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"uint256","name":"allowance","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"approve","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"approved","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"}],"name":"approveNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address","name":"token","type":"address"}],"name":"associateToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address[]","name":"tokens","type":"address[]"}],"name":"associateTokens","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint64","name":"amount","type":"uint64"},{"internalType":"int64[]","name":"serialNumbers","type":"int64[]"}],"name":"burnToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"uint64","name":"newTotalSupply","type":"uint64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"internalType":"uint256","name":"initialTotalSupply","type":"uint256"},{"internalType":"uint256","name":"decimals","type":"uint256"}],"name":"createFungibleToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"internalType":"uint256","name":"initialTotalSupply","type":"uint256"},{"internalType":"uint256","name":"decimals","type":"uint256"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"minimumAmount","type":"uint32"},{"internalType":"uint32","name":"maximumAmount","type":"uint32"},{"internalType":"bool","name":"netOfTransfers","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FractionalFee[]","name":"fractionalFees","type":"tuple[]"}],"name":"createFungibleTokenWithCustomFees","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"}],"name":"createNonFungibleToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.RoyaltyFee[]","name":"royaltyFees","type":"tuple[]"}],"name":"createNonFungibleTokenWithCustomFees","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"components":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"address","name":"accountID","type":"address"},{"internalType":"int64","name":"amount","type":"int64"}],"internalType":"struct IHederaTokenService.AccountAmount[]","name":"transfers","type":"tuple[]"},{"components":[{"internalType":"address","name":"senderAccountID","type":"address"},{"internalType":"address","name":"receiverAccountID","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"}],"internalType":"struct IHederaTokenService.NftTransfer[]","name":"nftTransfers","type":"tuple[]"}],"internalType":"struct IHederaTokenService.TokenTransferList[]","name":"tokenTransfers","type":"tuple[]"}],"name":"cryptoTransfer","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"deleteToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address","name":"token","type":"address"}],"name":"dissociateToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address[]","name":"tokens","type":"address[]"}],"name":"dissociateTokens","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"freezeToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"}],"name":"getApproved","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"address","name":"approved","type":"address"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getFungibleTokenInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"internalType":"int64","name":"totalSupply","type":"int64"},{"internalType":"bool","name":"deleted","type":"bool"},{"internalType":"bool","name":"defaultKycStatus","type":"bool"},{"internalType":"bool","name":"pauseStatus","type":"bool"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"minimumAmount","type":"uint32"},{"internalType":"uint32","name":"maximumAmount","type":"uint32"},{"internalType":"bool","name":"netOfTransfers","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FractionalFee[]","name":"fractionalFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.RoyaltyFee[]","name":"royaltyFees","type":"tuple[]"},{"internalType":"string","name":"ledgerId","type":"string"}],"internalType":"struct IHederaTokenService.TokenInfo","name":"tokenInfo","type":"tuple"},{"internalType":"uint32","name":"decimals","type":"uint32"}],"internalType":"struct IHederaTokenService.FungibleTokenInfo","name":"fungibleTokenInfo","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"}],"name":"getNonFungibleTokenInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"internalType":"int64","name":"totalSupply","type":"int64"},{"internalType":"bool","name":"deleted","type":"bool"},{"internalType":"bool","name":"defaultKycStatus","type":"bool"},{"internalType":"bool","name":"pauseStatus","type":"bool"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"minimumAmount","type":"uint32"},{"internalType":"uint32","name":"maximumAmount","type":"uint32"},{"internalType":"bool","name":"netOfTransfers","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FractionalFee[]","name":"fractionalFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.RoyaltyFee[]","name":"royaltyFees","type":"tuple[]"},{"internalType":"string","name":"ledgerId","type":"string"}],"internalType":"struct IHederaTokenService.TokenInfo","name":"tokenInfo","type":"tuple"},{"internalType":"int64","name":"serialNumber","type":"int64"},{"internalType":"address","name":"ownerId","type":"address"},{"internalType":"int64","name":"creationTime","type":"int64"},{"internalType":"bytes","name":"metadata","type":"bytes"},{"internalType":"address","name":"spenderId","type":"address"}],"internalType":"struct IHederaTokenService.NonFungibleTokenInfo","name":"nonFungibleTokenInfo","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenCustomFees","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"minimumAmount","type":"uint32"},{"internalType":"uint32","name":"maximumAmount","type":"uint32"},{"internalType":"bool","name":"netOfTransfers","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FractionalFee[]","name":"fractionalFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.RoyaltyFee[]","name":"royaltyFees","type":"tuple[]"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenDefaultFreezeStatus","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"defaultFreezeStatus","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenDefaultKycStatus","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"defaultKycStatus","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenExpiryInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"token","type":"tuple"},{"internalType":"int64","name":"totalSupply","type":"int64"},{"internalType":"bool","name":"deleted","type":"bool"},{"internalType":"bool","name":"defaultKycStatus","type":"bool"},{"internalType":"bool","name":"pauseStatus","type":"bool"},{"components":[{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"bool","name":"useCurrentTokenForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FixedFee[]","name":"fixedFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"minimumAmount","type":"uint32"},{"internalType":"uint32","name":"maximumAmount","type":"uint32"},{"internalType":"bool","name":"netOfTransfers","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.FractionalFee[]","name":"fractionalFees","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"numerator","type":"uint32"},{"internalType":"uint32","name":"denominator","type":"uint32"},{"internalType":"uint32","name":"amount","type":"uint32"},{"internalType":"address","name":"tokenId","type":"address"},{"internalType":"bool","name":"useHbarsForPayment","type":"bool"},{"internalType":"address","name":"feeCollector","type":"address"}],"internalType":"struct IHederaTokenService.RoyaltyFee[]","name":"royaltyFees","type":"tuple[]"},{"internalType":"string","name":"ledgerId","type":"string"}],"internalType":"struct IHederaTokenService.TokenInfo","name":"tokenInfo","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"keyType","type":"uint256"}],"name":"getTokenKey","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenType","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"int32","name":"tokenType","type":"int32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"grantTokenKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"approved","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"isFrozen","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"frozen","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"isKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"kycGranted","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"isToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"isToken","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint64","name":"amount","type":"uint64"},{"internalType":"bytes[]","name":"metadata","type":"bytes[]"}],"name":"mintToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"uint64","name":"newTotalSupply","type":"uint64"},{"internalType":"int64[]","name":"serialNumbers","type":"int64[]"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"pauseToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"redirectForToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"},{"internalType":"bytes","name":"result","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"revokeTokenKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"recipient","type":"address"},{"internalType":"int64","name":"serialNumber","type":"int64"}],"name":"transferNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"sender","type":"address[]"},{"internalType":"address[]","name":"receiver","type":"address[]"},{"internalType":"int64[]","name":"serialNumber","type":"int64[]"}],"name":"transferNFTs","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"recipient","type":"address"},{"internalType":"int64","name":"amount","type":"int64"}],"name":"transferToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"accountId","type":"address[]"},{"internalType":"int64[]","name":"amount","type":"int64[]"}],"name":"transferTokens","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"unfreezeToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"unpauseToken","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiryInfo","type":"tuple"}],"name":"updateTokenExpiryInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"uint32","name":"maxSupply","type":"uint32"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"tokenInfo","type":"tuple"}],"name":"updateTokenInfo","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"keys","type":"tuple[]"}],"name":"updateTokenKeys","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"},{"internalType":"uint32","name":"amount","type":"uint32"}],"name":"wipeTokenAccount","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"},{"internalType":"int64[]","name":"serialNumbers","type":"int64[]"}],"name":"wipeTokenAccountNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.bin
deleted file mode 100644
index 90911c2d85e9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161075338038061075383398181016040528101906100329190610252565b6000604051610040906101e3565b604051809103906000f08015801561005c573d6000803e3d6000fd5b5090506000819050600061007a82856100cb60201b6100091760201c565b9050601660030b81146100c2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100b9906102dc565b60405180910390fd5b5050505061042b565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161010492919061030b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161016e91906103ae565b6000604051808303816000865af19150503d80600081146101ab576040519150601f19603f3d011682016040523d82523d6000602084013e6101b0565b606091505b5091509150816101c15760156101d6565b808060200190518101906101d591906103fe565b5b60030b9250505092915050565b605c806106f783390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061021f826101f4565b9050919050565b61022f81610214565b811461023a57600080fd5b50565b60008151905061024c81610226565b92915050565b600060208284031215610268576102676101ef565b5b60006102768482850161023d565b91505092915050565b600082825260208201905092915050565b7f436f756c64206e6f74206173736f6369617465206163636f756e740000000000600082015250565b60006102c6601b8361027f565b91506102d182610290565b602082019050919050565b600060208201905081810360008301526102f5816102b9565b9050919050565b61030581610214565b82525050565b600060408201905061032060008301856102fc565b61032d60208301846102fc565b9392505050565b600081519050919050565b600081905092915050565b60005b8381101561036857808201518184015260208101905061034d565b83811115610377576000848401525b50505050565b600061038882610334565b610392818561033f565b93506103a281856020860161034a565b80840191505092915050565b60006103ba828461037d565b915081905092915050565b60008160030b9050919050565b6103db816103c5565b81146103e657600080fd5b50565b6000815190506103f8816103d2565b92915050565b600060208284031215610414576104136101ef565b5b6000610422848285016103e9565b91505092915050565b6102bd8061043a6000396000f3fe6080604052600080fd5b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401610042929190610162565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516100ac9190610205565b6000604051808303816000865af19150503d80600081146100e9576040519150601f19603f3d011682016040523d82523d6000602084013e6100ee565b606091505b5091509150816100ff576015610114565b80806020019051810190610113919061025a565b5b60030b9250505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061014c82610121565b9050919050565b61015c81610141565b82525050565b60006040820190506101776000830185610153565b6101846020830184610153565b9392505050565b600081519050919050565b600081905092915050565b60005b838110156101bf5780820151818401526020810190506101a4565b838111156101ce576000848401525b50505050565b60006101df8261018b565b6101e98185610196565b93506101f98185602086016101a1565b80840191505092915050565b600061021182846101d4565b915081905092915050565b600080fd5b60008160030b9050919050565b61023781610221565b811461024257600080fd5b50565b6000815190506102548161022e565b92915050565b6000602082840312156102705761026f61021c565b5b600061027e84828501610245565b9150509291505056fea2646970667358221220ce24b3f038f864e9bac41610a62419749eb116bc47fd246482d54600a60ccdf164736f6c634300080900336080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212203f61e21b1b75905fc3bade72cb2ceff4fc533cb4052a06da1e0ae2a275faa71664736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.json
deleted file mode 100644
index 3565af7a80f2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddr",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.bin
deleted file mode 100644
index 36fcfce60956..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610130806100206000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c8063b51c4f96146041578063c2722ecc146096578063e7148cc31460b2575b600080fd5b608060048036036020811015605557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505060dd565b6040518082815260200191505060405180910390f35b609c60e8565b6040518082815260200191505060405180910390f35b60db6004803603602081101560c657600080fd5b810190808035906020019092919050505060f1565b005b6000813b9050919050565b60008054905090565b806000819055505056fea265627a7a723158204ead8c770bb4bbf400a3b46a21621e7ee52bf58eb9102d3a46f6612e4e107cb864736f6c634300050b0032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.json b/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.json
deleted file mode 100644
index a4459dd16d72..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.json
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "getCodeSize",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_size",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getStore",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "inVal",
-        "type": "bytes32"
-      }
-    ],
-    "name": "setStore",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.bin
deleted file mode 100644
index f3e3688d828b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052604051620011fb380380620011fb8339818101604052810190620000299190620000ca565b60005b81811015620000825760006001826200004691906200012b565b90806001815401808255809150506001900390600052602060002001600090919091909150558080620000799062000188565b9150506200002c565b5050620001d6565b600080fd5b6000819050919050565b620000a4816200008f565b8114620000b057600080fd5b50565b600081519050620000c48162000099565b92915050565b600060208284031215620000e357620000e26200008a565b5b6000620000f384828501620000b3565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600062000138826200008f565b915062000145836200008f565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156200017d576200017c620000fc565b5b828201905092915050565b600062000195826200008f565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415620001cb57620001ca620000fc565b5b600182019050919050565b61101580620001e66000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630a284cb6146100515780630ce9bed914610083578063ccf485481461009f578063dd2a0c65146100cf575b600080fd5b61006b6004803603810190610066919061075b565b6100ff565b60405161007a939291906108be565b60405180910390f35b61009d600480360381019061009891906109f5565b61011d565b005b6100b960048036038101906100b49190610a6a565b610174565b6040516100c69190610ad1565b60405180910390f35b6100e960048036038101906100e49190610b22565b61018c565b6040516100f69190610b71565b60405180910390f35b6000806060610110856000866101bd565b9250925092509250925092565b6000436040516020016101309190610bad565b6040516020818303038152906040528051906020012090508160016000838152602001908152602001600020908051906020019061016f929190610453565b505050565b600061018285858585610335565b9050949350505050565b600160205281600052604060002081815481106101a857600080fd5b90600052602060002001600091509150505481565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016101fb93929190610d21565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102659190610d9b565b6000604051808303816000865af19150503d80600081146102a2576040519150601f19603f3d011682016040523d82523d6000602084013e6102a7565b606091505b50915091508161030357601560008067ffffffffffffffff8111156102cf576102ce610545565b5b6040519080825280602002602001820160405280156102fd5781602001602082028036833780820191505090505b50610318565b808060200190518101906103179190610eef565b5b8260030b9250809550819650829750505050505093509350939050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016103729493929190610f6d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103dc9190610d9b565b6000604051808303816000865af19150503d8060008114610419576040519150601f19603f3d011682016040523d82523d6000602084013e61041e565b606091505b50915091508161042f576015610444565b808060200190518101906104439190610fb2565b5b60030b92505050949350505050565b82805482825590600052602060002090810192821561048f579160200282015b8281111561048e578251825591602001919060010190610473565b5b50905061049c91906104a0565b5090565b5b808211156104b95760008160009055506001016104a1565b5090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006104fc826104d1565b9050919050565b61050c816104f1565b811461051757600080fd5b50565b60008135905061052981610503565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61057d82610534565b810181811067ffffffffffffffff8211171561059c5761059b610545565b5b80604052505050565b60006105af6104bd565b90506105bb8282610574565b919050565b600067ffffffffffffffff8211156105db576105da610545565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff82111561061157610610610545565b5b61061a82610534565b9050602081019050919050565b82818337600083830152505050565b6000610649610644846105f6565b6105a5565b905082815260208101848484011115610665576106646105f1565b5b610670848285610627565b509392505050565b600082601f83011261068d5761068c61052f565b5b813561069d848260208601610636565b91505092915050565b60006106b96106b4846105c0565b6105a5565b905080838252602082019050602084028301858111156106dc576106db6105ec565b5b835b8181101561072357803567ffffffffffffffff8111156107015761070061052f565b5b80860161070e8982610678565b855260208501945050506020810190506106de565b5050509392505050565b600082601f8301126107425761074161052f565b5b81356107528482602086016106a6565b91505092915050565b60008060408385031215610772576107716104c7565b5b60006107808582860161051a565b925050602083013567ffffffffffffffff8111156107a1576107a06104cc565b5b6107ad8582860161072d565b9150509250929050565b6000819050919050565b6107ca816107b7565b82525050565b600067ffffffffffffffff82169050919050565b6107ed816107d0565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60008160070b9050919050565b6108358161081f565b82525050565b6000610847838361082c565b60208301905092915050565b6000602082019050919050565b600061086b826107f3565b61087581856107fe565b93506108808361080f565b8060005b838110156108b1578151610898888261083b565b97506108a383610853565b925050600181019050610884565b5085935050505092915050565b60006060820190506108d360008301866107c1565b6108e060208301856107e4565b81810360408301526108f28184610860565b9050949350505050565b600067ffffffffffffffff82111561091757610916610545565b5b602082029050602081019050919050565b6000819050919050565b61093b81610928565b811461094657600080fd5b50565b60008135905061095881610932565b92915050565b600061097161096c846108fc565b6105a5565b90508083825260208201905060208402830185811115610994576109936105ec565b5b835b818110156109bd57806109a98882610949565b845260208401935050602081019050610996565b5050509392505050565b600082601f8301126109dc576109db61052f565b5b81356109ec84826020860161095e565b91505092915050565b600060208284031215610a0b57610a0a6104c7565b5b600082013567ffffffffffffffff811115610a2957610a286104cc565b5b610a35848285016109c7565b91505092915050565b610a478161081f565b8114610a5257600080fd5b50565b600081359050610a6481610a3e565b92915050565b60008060008060808587031215610a8457610a836104c7565b5b6000610a928782880161051a565b9450506020610aa38782880161051a565b9350506040610ab48782880161051a565b9250506060610ac587828801610a55565b91505092959194509250565b6000602082019050610ae660008301846107c1565b92915050565b6000819050919050565b610aff81610aec565b8114610b0a57600080fd5b50565b600081359050610b1c81610af6565b92915050565b60008060408385031215610b3957610b386104c7565b5b6000610b4785828601610b0d565b9250506020610b5885828601610949565b9150509250929050565b610b6b81610928565b82525050565b6000602082019050610b866000830184610b62565b92915050565b6000819050919050565b610ba7610ba282610928565b610b8c565b82525050565b6000610bb98284610b96565b60208201915081905092915050565b610bd1816104f1565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610c3d578082015181840152602081019050610c22565b83811115610c4c576000848401525b50505050565b6000610c5d82610c03565b610c678185610c0e565b9350610c77818560208601610c1f565b610c8081610534565b840191505092915050565b6000610c978383610c52565b905092915050565b6000602082019050919050565b6000610cb782610bd7565b610cc18185610be2565b935083602082028501610cd385610bf3565b8060005b85811015610d0f5784840389528151610cf08582610c8b565b9450610cfb83610c9f565b925060208a01995050600181019050610cd7565b50829750879550505050505092915050565b6000606082019050610d366000830186610bc8565b610d4360208301856107e4565b8181036040830152610d558184610cac565b9050949350505050565b600081905092915050565b6000610d7582610c03565b610d7f8185610d5f565b9350610d8f818560208601610c1f565b80840191505092915050565b6000610da78284610d6a565b915081905092915050565b60008160030b9050919050565b610dc881610db2565b8114610dd357600080fd5b50565b600081519050610de581610dbf565b92915050565b610df4816107d0565b8114610dff57600080fd5b50565b600081519050610e1181610deb565b92915050565b600067ffffffffffffffff821115610e3257610e31610545565b5b602082029050602081019050919050565b600081519050610e5281610a3e565b92915050565b6000610e6b610e6684610e17565b6105a5565b90508083825260208201905060208402830185811115610e8e57610e8d6105ec565b5b835b81811015610eb75780610ea38882610e43565b845260208401935050602081019050610e90565b5050509392505050565b600082601f830112610ed657610ed561052f565b5b8151610ee6848260208601610e58565b91505092915050565b600080600060608486031215610f0857610f076104c7565b5b6000610f1686828701610dd6565b9350506020610f2786828701610e02565b925050604084015167ffffffffffffffff811115610f4857610f476104cc565b5b610f5486828701610ec1565b9150509250925092565b610f678161081f565b82525050565b6000608082019050610f826000830187610bc8565b610f8f6020830186610bc8565b610f9c6040830185610bc8565b610fa96060830184610f5e565b95945050505050565b600060208284031215610fc857610fc76104c7565b5b6000610fd684828501610dd6565b9150509291505056fea2646970667358221220d6ff4906077f1407e05a101b88d16d8749f193930def3d5c0667386ef38e590164736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.json b/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.json
deleted file mode 100644
index da357cf6430a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.json
+++ /dev/null
@@ -1,118 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256[]",
-        "name": "speck",
-        "type": "uint256[]"
-      }
-    ],
-    "name": "contaminate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "laundry",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintNft",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "transferNft",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.bin
deleted file mode 100644
index bae3e1b99e41..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040525f8055348015610012575f80fd5b50610345806100205f395ff3fe608060405234801561000f575f80fd5b506004361061004a575f3560e01c806311f95f6f1461004e5780633a32b5491461006c578063cfc720071461008a578063ff489d31146100a6575b5f80fd5b6100566100c4565b6040516100639190610150565b60405180910390f35b610074610100565b6040516100819190610181565b60405180910390f35b6100a4600480360381019061009f91906101f8565b610119565b005b6100ae610132565b6040516100bb9190610150565b60405180910390f35b5f6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100f79061027d565b60405180910390fd5b5f805f815461010e906102c8565b919050819055905090565b8073ffffffffffffffffffffffffffffffffffffffff16ff5b5f80fd5b5f8115159050919050565b61014a81610136565b82525050565b5f6020820190506101635f830184610141565b92915050565b5f819050919050565b61017b81610169565b82525050565b5f6020820190506101945f830184610172565b92915050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6101c78261019e565b9050919050565b6101d7816101bd565b81146101e1575f80fd5b50565b5f813590506101f2816101ce565b92915050565b5f6020828403121561020d5761020c61019a565b5b5f61021a848285016101e4565b91505092915050565b5f82825260208201905092915050565b7f526576657274526561736f6e00000000000000000000000000000000000000005f82015250565b5f610267600c83610223565b915061027282610233565b602082019050919050565b5f6020820190508181035f8301526102948161025b565b9050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f6102d282610169565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036103045761030361029b565b5b60018201905091905056fea2646970667358221220bffe4d356c5c6521f6781fb14118b8ee146b0f46f1f55851826ab29b1ee7bc1164736f6c63430008160033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.json b/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.json
deleted file mode 100644
index c43d9e43304d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.json
+++ /dev/null
@@ -1,54 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "externalFunction",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "revertWithRevertReason",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "revertWithoutRevertReason",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "selfdestruct",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.bin
deleted file mode 100644
index bcddc5ab89a3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610c92806100115f395ff3fe608060405234801561000f575f80fd5b50600436106100a7575f3560e01c8063a03fa7e31161006f578063a03fa7e31461014b578063a6a3a30014610167578063cc19f13f14610197578063cfc72007146101b3578063dd731395146101cf578063e6d25245146101ff576100a7565b80632da1b130146100ab5780633e657d0a146100c75780637a223a77146100e35780637ec86f89146100ff57806390f18d831461011b575b5f80fd5b6100c560048036038101906100c09190610a8c565b61021b565b005b6100e160048036038101906100dc9190610a8c565b610285565b005b6100fd60048036038101906100f89190610a8c565b610370565b005b61011960048036038101906101149190610a8c565b61045a565b005b61013560048036038101906101309190610a8c565b610545565b6040516101429190610acf565b60405180910390f35b61016560048036038101906101609190610b23565b610667565b005b610181600480360381019061017c9190610a8c565b6106af565b60405161018e9190610acf565b60405180910390f35b6101b160048036038101906101ac9190610a8c565b6107d0565b005b6101cd60048036038101906101c89190610b23565b6108bb565b005b6101e960048036038101906101e49190610a8c565b6108d4565b6040516101f69190610acf565b60405180910390f35b61021960048036038101906102149190610b23565b6109f5565b005b8073ffffffffffffffffffffffffffffffffffffffff16600160405161024090610b7b565b5f6040518083038185875af1925050503d805f811461027a576040519150601f19603f3d011682016040523d82523d5f602084013e61027f565b606091505b50505050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fff489d31000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161032c9190610bf1565b5f604051808303815f865af19150503d805f8114610365576040519150601f19603f3d011682016040523d82523d5f602084013e61036a565b606091505b50505050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f477387d1000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104179190610bf1565b5f60405180830381855afa9150503d805f811461044f576040519150601f19603f3d011682016040523d82523d5f602084013e610454565b606091505b50505050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f11f95f6f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105019190610bf1565b5f604051808303815f865af19150503d805f811461053a576040519150601f19603f3d011682016040523d82523d5f602084013e61053f565b606091505b50505050565b5f805f8373ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f3a32b549000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105ef9190610bf1565b5f604051808303815f865af19150503d805f8114610628576040519150601f19603f3d011682016040523d82523d5f602084013e61062d565b606091505b509150915081801561063f57505f8151115b610649575f61065e565b8080602001905181019061065d9190610c31565b5b92505050919050565b8073ffffffffffffffffffffffffffffffffffffffff166108fc600190811502906040515f60405180830381858888f193505050501580156106ab573d5f803e3d5ffd5b5050565b5f805f8373ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f3a32b549000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107599190610bf1565b5f60405180830381855afa9150503d805f8114610791576040519150601f19603f3d011682016040523d82523d5f602084013e610796565b606091505b50915091508180156107a857505f8151115b6107b2575f6107c7565b808060200190518101906107c69190610c31565b5b92505050919050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f477387d1000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108779190610bf1565b5f604051808303815f865af19150503d805f81146108b0576040519150601f19603f3d011682016040523d82523d5f602084013e6108b5565b606091505b50505050565b8073ffffffffffffffffffffffffffffffffffffffff16ff5b5f805f8373ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f3a32b549000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161097e9190610bf1565b5f60405180830381855af49150503d805f81146109b6576040519150601f19603f3d011682016040523d82523d5f602084013e6109bb565b606091505b50915091508180156109cd57505f8151115b6109d7575f6109ec565b808060200190518101906109eb9190610c31565b5b92505050919050565b8073ffffffffffffffffffffffffffffffffffffffff166108fc600190811502906040515f60405180830381858888f193505050505050565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f610a5b82610a32565b9050919050565b610a6b81610a51565b8114610a75575f80fd5b50565b5f81359050610a8681610a62565b92915050565b5f60208284031215610aa157610aa0610a2e565b5b5f610aae84828501610a78565b91505092915050565b5f819050919050565b610ac981610ab7565b82525050565b5f602082019050610ae25f830184610ac0565b92915050565b5f610af282610a32565b9050919050565b610b0281610ae8565b8114610b0c575f80fd5b50565b5f81359050610b1d81610af9565b92915050565b5f60208284031215610b3857610b37610a2e565b5b5f610b4584828501610b0f565b91505092915050565b5f81905092915050565b50565b5f610b665f83610b4e565b9150610b7182610b58565b5f82019050919050565b5f610b8582610b5b565b9150819050919050565b5f81519050919050565b5f5b83811015610bb6578082015181840152602081019050610b9b565b5f8484015250505050565b5f610bcb82610b8f565b610bd58185610b4e565b9350610be5818560208601610b99565b80840191505092915050565b5f610bfc8284610bc1565b915081905092915050565b610c1081610ab7565b8114610c1a575f80fd5b50565b5f81519050610c2b81610c07565b92915050565b5f60208284031215610c4657610c45610a2e565b5b5f610c5384828501610c1d565b9150509291505056fea26469706673582212201d5736d4bf2219efe6772a8b1fcece3bae634354757231dab6b82efa3733b65a64736f6c63430008160033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.json b/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.json
deleted file mode 100644
index b5d97ffbc0e6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.json
+++ /dev/null
@@ -1,168 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "callExternalFunction",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "callNonExisting",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "callRevertWithRevertReason",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "callRevertWithoutRevertReason",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "callWithValueTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCallExternalFunction",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "selfdestruct",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "sendTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "staticCallExternalFunction",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "staticCallNonExisting",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "transferTo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InvalidBytecode/InvalidByteCode.json b/hedera-node/test-clients/src/main/resource/contract/contracts/InvalidBytecode/InvalidByteCode.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InvalidBytecode/InvalidBytecode.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/InvalidBytecode/InvalidBytecode.bin
deleted file mode 100644
index 78c28c15da09..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InvalidBytecode/InvalidBytecode.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600160005534801561001557600080fd5b5060be806100246000396000f3006080604052600436106049576000357c0100000000000000000000f16806315672a2e14604e578063a0c5f54a146062575b600080fd5b348015605957600080fd5b5060606076565b005b348015606d57600080fd5b506074607e565b005b607c607e565b565b60016000540160008190555060906076565b5600a165627a7a723058207393b780fa28939c9af5317493a1b77d4a7cf467194c083f53e516123ad0597a0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.bin
deleted file mode 100644
index 5ccce20b7413..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526557f55598fac26003553480156200001b57600080fd5b506040516020806200236a83398101806040526200003d919081019062000137565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f21f4b4d1cb9d37227fd04f9ddaab410ce2cbfd710614fa6e7cca5f8b7dc9e7e4336000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051620000d192919062000174565b60405180910390a180600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050620001e1565b60006200012f8251620001c1565b905092915050565b6000602082840312156200014a57600080fd5b60006200015a8482850162000121565b91505092915050565b6200016e81620001a1565b82525050565b60006040820190506200018b600083018562000163565b6200019a602083018462000163565b9392505050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b61217980620001f16000396000f3006080604052600436106100e6576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063168fb437146100eb578063218c66ea146101285780632fbafffa14610151578063599ec5141461017a5780636a938567146101b75780638da5cb5b146101f457806395bc26731461021f578063b130482d14610248578063b55cda3214610285578063bd110268146102c3578063c29fb0f114610304578063de18e1021461032f578063e4eb64c114610358578063f2fde38b14610395578063f4a5c652146103be578063fb2f5064146103fb575b600080fd5b3480156100f757600080fd5b50610112600480360361010d919081019061198b565b610438565b60405161011f9190611d44565b60405180910390f35b34801561013457600080fd5b5061014f600480360361014a9190810190611a53565b610480565b005b34801561015d57600080fd5b50610178600480360361017391908101906119f0565b610a6c565b005b34801561018657600080fd5b506101a1600480360361019c919081019061198b565b610c13565b6040516101ae9190611d44565b60405180910390f35b3480156101c357600080fd5b506101de60048036036101d9919081019061198b565b610c5b565b6040516101eb9190611da3565b60405180910390f35b34801561020057600080fd5b50610209610c8d565b6040516102169190611d44565b60405180910390f35b34801561022b57600080fd5b506102466004803603610241919081019061198b565b610cb2565b005b34801561025457600080fd5b5061026f600480360361026a919081019061198b565b6111e7565b60405161027c9190611f44565b60405180910390f35b34801561029157600080fd5b506102ac60048036036102a79190810190611ace565b61120f565b6040516102ba929190611f5f565b60405180910390f35b3480156102cf57600080fd5b506102ea60048036036102e5919081019061198b565b611272565b6040516102fb959493929190611e41565b60405180910390f35b34801561031057600080fd5b50610319611380565b6040516103269190611d5f565b60405180910390f35b34801561033b57600080fd5b50610356600480360361035191908101906119b4565b6113dc565b005b34801561036457600080fd5b5061037f600480360361037a9190810190611962565b6114a8565b60405161038c9190611da3565b60405180910390f35b3480156103a157600080fd5b506103bc60048036036103b79190810190611962565b6114c8565b005b3480156103ca57600080fd5b506103e560048036036103e09190810190611962565b61161d565b6040516103f29190611dbe565b60405180910390f35b34801561040757600080fd5b50610422600480360361041d9190810190611962565b611635565b60405161042f9190611d81565b60405180910390f35b600060046000836000191660001916815260200190815260200160002060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600061048a611733565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156104e557600080fd5b856040516020018082805190602001908083835b60208310151561051e57805182526020820191506020810190506020830392506104f9565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040526040518082805190602001908083835b6020831015156105875780518252602082019150602081019050602083039250610562565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040518091039020915060056000836000191660001916815260200190815260200160002060009054906101000a900460ff16151515610621576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161061890611ec4565b60405180910390fd5b600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156106b0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106a790611f04565b60405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff1615151561073f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161073690611f24565b60405180910390fd5b60a060405190810160405280836000191681526020018781526020018681526020018573ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff168152509050806004600084600019166000191681526020019081526020016000206000820151816000019060001916905560208201518160010190805190602001906107e1929190611792565b506040820151816002015560608201518160030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060808201518160040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509050506002829080600181540180825580915050906001820390600052602060002001600090919290919091509060001916905550600160056000846000191660001916815260200190815260200160002060006101000a81548160ff0219169083151502179055506001600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506001600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555081600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020816000191690555081600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081600019169055507fdd771c01692ee48230e561ab6844adf84069381e47978cb9455ed454fa2bb24d828787878742604051610a5c96959493929190611dd9565b60405180910390a1505050505050565b6000806000806000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610acd57600080fd5b6004600089600019166000191681526020019081526020016000209350836002015492508360030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1691508360040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050868460020181905550848460030160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550858460040160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f2f48de9868facdd451ba466e2ad5c9507ce81ac1a6dbcc73a9c03a3aaa725b05838842604051610c0193929190611f88565b60405180910390a15050505050505050565b600060046000836000191660001916815260200190815260200160002060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600060056000836000191660001916815260200190815260200160002060009054906101000a900460ff169050919050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610d1257600080fd5b60056000856000191660001916815260200190815260200160002060009054906101000a900460ff161515610d7c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d7390611ee4565b60405180910390fd5b60046000856000191660001916815260200190815260200160002060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16925060046000856000191660001916815260200190815260200160002060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169150600460008560001916600019168152602001908152602001600020600080820160009055600182016000610e329190611812565b60028201600090556003820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556004820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555050600060056000866000191660001916815260200190815260200160002060006101000a81548160ff02191690831515021790555060016002805490501415610ef857610ee560016002805490506116cc90919063ffffffff16565b600281610ef2919061185a565b5061103e565b600090505b60028054905081101561103d57600281815481101515610f1957fe5b9060005260206000200154600019168460001916141561103057610f4c60016002805490506116cc90919063ffffffff16565b811415610f7f57610f6c60016002805490506116cc90919063ffffffff16565b600281610f79919061185a565b5061102f565b6002610f9a60016002805490506116cc90919063ffffffff16565b815481101515610fa657fe5b9060005260206000200154600282815481101515610fc057fe5b9060005260206000200181600019169055506002610fed60016002805490506116cc90919063ffffffff16565b815481101515610ff957fe5b906000526020600020016000905561102060016002805490506116cc90919063ffffffff16565b60028161102d919061185a565b505b5b8080600101915050610efd565b5b600060056000866000191660001916815260200190815260200160002060006101000a81548160ff0219169083151502179055506000600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506000600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff021916908315150217905550600760008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009055600760008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600090557f2600a7aae2002080643cca09c4b126c703e2a7d8fa6e8d9db0ba82a9f234d59584426040516111d9929190611e9b565b60405180910390a150505050565b6000600460008360001916600019168152602001908152602001600020600201549050919050565b6000806000806000611220866111e7565b925061124961271061123b858a6116e590919063ffffffff16565b61171d90919063ffffffff16565b9150611260600354836116e590919063ffffffff16565b90508181945094505050509250929050565b6004602052806000526040600020600091509050806000015490806001018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156113245780601f106112f957610100808354040283529160200191611324565b820191906000526020600020905b81548152906001019060200180831161130757829003601f168201915b5050505050908060020154908060030160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060040160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905085565b606060028054806020026020016040519081016040528092919081815260200182805480156113d257602002820191906000526020600020905b815460001916815260200190600101908083116113ba575b5050505050905090565b6000806000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561143a57600080fd5b6004600085600019166000191681526020019081526020016000209150816002015490508282600201819055507f2f48de9868facdd451ba466e2ad5c9507ce81ac1a6dbcc73a9c03a3aaa725b0581844260405161149a93929190611f88565b60405180910390a150505050565b60066020528060005260406000206000915054906101000a900460ff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561152357600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561155f57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60076020528060005260406000206000915090505481565b6060600860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054806020026020016040519081016040528092919081815260200182805480156116c057602002820191906000526020600020905b8154815260200190600101908083116116ac575b50505050509050919050565b60008282111515156116da57fe5b818303905092915050565b6000808314156116f85760009050611717565b818302905081838281151561170957fe5b0414151561171357fe5b8090505b92915050565b6000818381151561172a57fe5b04905092915050565b60a060405190810160405280600080191681526020016060815260200160008152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106117d357805160ff1916838001178555611801565b82800160010185558215611801579182015b828111156118005782518255916020019190600101906117e5565b5b50905061180e9190611886565b5090565b50805460018160011615610100020316600290046000825580601f106118385750611857565b601f0160209004906000526020600020908101906118569190611886565b5b50565b8154818355818111156118815781836000526020600020918201910161188091906118ab565b5b505050565b6118a891905b808211156118a457600081600090555060010161188c565b5090565b90565b6118cd91905b808211156118c95760008160009055506001016118b1565b5090565b90565b60006118dc82356120b8565b905092915050565b60006118f082356120d8565b905092915050565b600082601f830112151561190b57600080fd5b813561191e61191982611fec565b611fbf565b9150808252602083016020830185838301111561193a57600080fd5b6119458382846120ec565b50505092915050565b600061195a82356120e2565b905092915050565b60006020828403121561197457600080fd5b6000611982848285016118d0565b91505092915050565b60006020828403121561199d57600080fd5b60006119ab848285016118e4565b91505092915050565b600080604083850312156119c757600080fd5b60006119d5858286016118e4565b92505060206119e68582860161194e565b9150509250929050565b60008060008060808587031215611a0657600080fd5b6000611a14878288016118e4565b9450506020611a258782880161194e565b9350506040611a36878288016118d0565b9250506060611a47878288016118d0565b91505092959194509250565b60008060008060808587031215611a6957600080fd5b600085013567ffffffffffffffff811115611a8357600080fd5b611a8f878288016118f8565b9450506020611aa08782880161194e565b9350506040611ab1878288016118d0565b9250506060611ac2878288016118d0565b91505092959194509250565b60008060408385031215611ae157600080fd5b6000611aef8582860161194e565b9250506020611b00858286016118e4565b9150509250929050565b611b1381612078565b82525050565b6000611b2482612032565b808452602084019350611b3683612018565b60005b82811015611b6857611b4c868351611bde565b611b558261205e565b9150602086019550600181019050611b39565b50849250505092915050565b6000611b7f8261203d565b808452602084019350611b9183612025565b60005b82811015611bc357611ba7868351611d35565b611bb08261206b565b9150602086019550600181019050611b94565b50849250505092915050565b611bd881612098565b82525050565b611be7816120a4565b82525050565b6000611bf882612053565b808452611c0c8160208601602086016120fb565b611c158161212e565b602085010191505092915050565b6000611c2e82612048565b808452611c428160208601602086016120fb565b611c4b8161212e565b602085010191505092915050565b6000601b82527f4a7572697364696374696f6e20616c726561647920696e2075736500000000006020830152604082019050919050565b6000601f82527f4a7572697364696374696f6e20636f6465206e6f7420696e20696e20757365006020830152604082019050919050565b6000602082527f496e76656e746f7279206164647265737320616c726561647920696e207573656020830152604082019050919050565b6000601e82527f52657365727665206164647265737320616c726561647920696e2075736500006020830152604082019050919050565b611d3e816120ae565b82525050565b6000602082019050611d596000830184611b0a565b92915050565b60006020820190508181036000830152611d798184611b19565b905092915050565b60006020820190508181036000830152611d9b8184611b74565b905092915050565b6000602082019050611db86000830184611bcf565b92915050565b6000602082019050611dd36000830184611bde565b92915050565b600060c082019050611dee6000830189611bde565b8181036020830152611e008188611bed565b9050611e0f6040830187611d35565b611e1c6060830186611b0a565b611e296080830185611b0a565b611e3660a0830184611d35565b979650505050505050565b600060a082019050611e566000830188611bde565b8181036020830152611e688187611c23565b9050611e776040830186611d35565b611e846060830185611b0a565b611e916080830184611b0a565b9695505050505050565b6000604082019050611eb06000830185611bde565b611ebd6020830184611d35565b9392505050565b60006020820190508181036000830152611edd81611c59565b9050919050565b60006020820190508181036000830152611efd81611c90565b9050919050565b60006020820190508181036000830152611f1d81611cc7565b9050919050565b60006020820190508181036000830152611f3d81611cfe565b9050919050565b6000602082019050611f596000830184611d35565b92915050565b6000604082019050611f746000830185611d35565b611f816020830184611d35565b9392505050565b6000606082019050611f9d6000830186611d35565b611faa6020830185611d35565b611fb76040830184611d35565b949350505050565b6000604051905081810181811067ffffffffffffffff82111715611fe257600080fd5b8060405250919050565b600067ffffffffffffffff82111561200357600080fd5b601f19601f8301169050602081019050919050565b6000602082019050919050565b6000602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60008115159050919050565b6000819050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000819050919050565b82818337600083830152505050565b60005b838110156121195780820151818401526020810190506120fe565b83811115612128576000848401525b50505050565b6000601f19601f83011690509190505600a265627a7a7230582059e3ed54a566c42f62dd284424b5e850ab7eae0ae8417e52993f8272719305a06c6578706572696d656e74616cf50037
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.json
deleted file mode 100644
index 7c71d3c023a8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.json
+++ /dev/null
@@ -1,444 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getInventory",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "name": "taxRate",
-        "type": "uint256"
-      },
-      {
-        "name": "inventory",
-        "type": "address"
-      },
-      {
-        "name": "reserve",
-        "type": "address"
-      }
-    ],
-    "name": "add",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      },
-      {
-        "name": "taxRate",
-        "type": "uint256"
-      },
-      {
-        "name": "reserve",
-        "type": "address"
-      },
-      {
-        "name": "inventory",
-        "type": "address"
-      }
-    ],
-    "name": "setJurisdictionParams",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getReserve",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "isValid",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "remove",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getTaxRate",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "priceCents",
-        "type": "uint256"
-      },
-      {
-        "name": "code",
-        "type": "bytes32"
-      }
-    ],
-    "name": "getTaxes",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "jurisdictions",
-    "outputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      },
-      {
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "name": "taxRate",
-        "type": "uint256"
-      },
-      {
-        "name": "inventory",
-        "type": "address"
-      },
-      {
-        "name": "reserve",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getCodes",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bytes32[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "code",
-        "type": "bytes32"
-      },
-      {
-        "name": "taxRate",
-        "type": "uint256"
-      }
-    ],
-    "name": "setTaxRate",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "isBitcarbon",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "bitcarbonJurisdiction",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "inventory",
-        "type": "address"
-      }
-    ],
-    "name": "getPendingTokens",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_admin",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "code",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "indexed": false,
-        "name": "taxRate",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "inventory",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "reserve",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "JurisdictionAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "code",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "JurisdictionRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "oldTaxRate",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "newTaxRate",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "TaxRateChanged",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnableFired",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.bin
deleted file mode 100644
index 9ec13f0bd7b2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061015f806100206000396000f3fe60806040526004361061001e5760003560e01c80635f232eb914610023575b600080fd5b61003d600480360381019061003891906100e9565b61003f565b005b60008267ffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc8367ffffffffffffffff169081150290604051600060405180830381858888f1935050505015801561009e573d6000803e3d6000fd5b50505050565b600080fd5b600067ffffffffffffffff82169050919050565b6100c6816100a9565b81146100d157600080fd5b50565b6000813590506100e3816100bd565b92915050565b60008060408385031215610100576100ff6100a4565b5b600061010e858286016100d4565b925050602061011f858286016100d4565b915050925092905056fea2646970667358221220784bd35f7430bb5d4810da741baf517ea82d8d53959821301f0d59838d731f0764736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.json b/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.json
deleted file mode 100644
index e6ee63de7bb0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "account_num",
-        "type": "uint64"
-      },
-      {
-        "internalType": "uint64",
-        "name": "value",
-        "type": "uint64"
-      }
-    ],
-    "name": "sendTo",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.bin
deleted file mode 100644
index 76647bfde5b1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220e0123f1be4ec52b4828258ac2d72eec0121cb764f9659fb08029f0a1de50728964736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.json b/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.bin
deleted file mode 100644
index 3f42f1124923..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161001d9061005f565b604051809103906000f080158015610039573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b039290921691909117905561006c565b61140f8061150783390190565b61148c8061007b6000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80638f8d7f99116100665780638f8d7f9914610136578063af2377d614610149578063af99c6331461015e578063d614cdb814610171578063f2c31ff41461019257600080fd5b80633b3bff0f146100a35780633c4dd32e146100c9578063593d6e82146100ea5780636fc3cbaf146100fd5780637c41ad2c14610123575b600080fd5b6100b66100b1366004610855565b6101bf565b6040519081526020015b60405180910390f35b6100dc6100d7366004610879565b610299565b6040516100c092919061096c565b6100b66100f8366004610a58565b610380565b61011061010b366004610b85565b61045d565b60405160079190910b81526020016100c0565b6100b6610131366004610855565b610489565b610110610144366004610d22565b6104b7565b61015c610157366004610faf565b6104ed565b005b61011061016c366004610d22565b6105b5565b61018461017f366004610855565b6105eb565b6040516100c0929190611013565b6101a56101a0366004610d22565b6106f5565b6040805160079390930b83529015156020830152016100c0565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610227919061104d565b6000604051808303816000865af19150503d8060008114610264576040519150601f19603f3d011682016040523d82523d6000602084013e610269565b606091505b50915091508161027a57601561028e565b8080602001905181019061028e919061107b565b60030b949350505050565b60006102a36107ea565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b17905290516000918291610167916102fd9161104d565b6000604051808303816000865af19150503d806000811461033a576040519150601f19603f3d011682016040523d82523d6000602084013e61033f565b606091505b509150915061034c6107ea565b826103595760158161036d565b8180602001905181019061036d91906110e6565b60039190910b9890975095505050505050565b60008060006101676001600160a01b031663593d6e8260e01b86866040516024016103ac9291906111c1565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516103ea919061104d565b6000604051808303816000865af19150503d8060008114610427576040519150601f19603f3d011682016040523d82523d6000602084013e61042c565b606091505b50915091508161043d576015610451565b80806020019051810190610451919061107b565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b86866040516024016103ac929190611204565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b906044016101e9565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b906064016103ac565b60005460405163123973ef60e01b81526001600160a01b039091169063123973ef9061051d9085906004016112e9565b600060405180830381600087803b15801561053757600080fd5b505af115801561054b573d6000803e3d6000fd5b50505050600061055a826107c0565b9050601681146105b05760405162461bcd60e51b815260206004820152601660248201527f43727970746f205472616e73666572204661696c656400000000000000000000604482015260640160405180910390fd5b505050565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b906064016103ac565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b17905292519092839182916101679161065d919061104d565b6000604051808303816000865af19150503d806000811461069a576040519150601f19603f3d011682016040523d82523d6000602084013e61069f565b606091505b5060408051606081018252600080825260208201819052918101919091529193509150826106cf576015816106e3565b818060200190518101906106e391906113bf565b60039190910b97909650945050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b1790529051600091829182918291610167916107579161104d565b6000604051808303816000865af19150503d8060008114610794576040519150601f19603f3d011682016040523d82523d6000602084013e610799565b606091505b5091509150816107ac57601560006106e3565b808060200190518101906106e3919061142a565b60008060006101676001600160a01b031663189a554c60e01b856040516024016101e991906112e9565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001600160a01b038116811461084257600080fd5b50565b80356108508161082d565b919050565b60006020828403121561086757600080fd5b81356108728161082d565b9392505050565b6000806040838503121561088c57600080fd5b82356108978161082d565b946020939093013593505050565b60005b838110156108c05781810151838201526020016108a8565b838111156108cf576000848401525b50505050565b600081518084526108ed8160208601602086016108a5565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a0604086015261093960a08601836108d5565b91506060840151858303606087015261095283826108d5565b925050806080850151166080860152508091505092915050565b8260070b81526040602082015260006109886040830184610901565b949350505050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff811182821017156109c9576109c9610990565b60405290565b6040805190810167ffffffffffffffff811182821017156109c9576109c9610990565b60405160a0810167ffffffffffffffff811182821017156109c9576109c9610990565b604051601f8201601f1916810167ffffffffffffffff81118282101715610a3e57610a3e610990565b604052919050565b63ffffffff8116811461084257600080fd5b6000808284036080811215610a6c57600080fd5b8335610a778161082d565b92506060601f1982011215610a8b57600080fd5b50610a946109a6565b6020840135610aa281610a46565b81526040840135610ab28161082d565b60208201526060840135610ac581610a46565b6040820152919491935090915050565b600067ffffffffffffffff821115610aef57610aef610990565b5060051b60200190565b801515811461084257600080fd5b600067ffffffffffffffff821115610b2157610b21610990565b50601f01601f191660200190565b600082601f830112610b4057600080fd5b8135610b53610b4e82610b07565b610a15565b818152846020838601011115610b6857600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610b9857600080fd5b610ba2833561082d565b82359150602083013567ffffffffffffffff80821115610bc157600080fd5b818501915085601f830112610bd557600080fd5b610be2610b4e8335610ad5565b82358082526020808301929160051b85010188811115610c0157600080fd5b602085015b81811015610d13578481351115610c1c57600080fd5b80358601601f196040828d0382011215610c3557600080fd5b610c3d6109cf565b60208301358152604083013588811115610c5657600080fd5b929092019160a0838e0383011215610c6d57600080fd5b610c756109f2565b91506020830135610c8581610af9565b82526040830135610c958161082d565b6020830152606083013588811115610cac57600080fd5b610cbb8e602083870101610b2f565b604084015250608083013588811115610cd357600080fd5b610ce28e602083870101610b2f565b606084015250610cf460a08401610845565b6080830152602081810192909252865294850194919091019050610c06565b50959890975095505050505050565b60008060408385031215610d3557600080fd5b8235610d408161082d565b91506020830135610d508161082d565b809150509250929050565b8035600781900b811461085057600080fd5b600082601f830112610d7e57600080fd5b81356020610d8e610b4e83610ad5565b82815260609283028501820192828201919087851115610dad57600080fd5b8387015b85811015610e0d5781818a031215610dc95760008081fd5b610dd16109a6565b8135610ddc8161082d565b815281860135610deb8161082d565b818701526040610dfc838201610d5b565b908201528452928401928101610db1565b5090979650505050505050565b600082601f830112610e2b57600080fd5b610e38610b4e8335610ad5565b82358082526020808301929160051b85010185811115610e5757600080fd5b602085015b81811015610fa45767ffffffffffffffff8082351115610e7b57600080fd5b813587016060818a03601f19011215610e9357600080fd5b610e9b6109a6565b610ea8602083013561082d565b602082013581528260408301351115610ec057600080fd5b604082013582018a603f820112610ed657600080fd5b6020810135610ee7610b4e82610ad5565b81815260069190911b82016040019060208101908d831115610f0857600080fd5b6040840193505b82841015610f63576040848f031215610f2757600080fd5b610f2f6109cf565b610f39853561082d565b84358152610f4960208601610d5b565b602082015280835250602082019150604084019350610f0f565b60208501525050506060820135831015610f7c57600080fd5b610f8f8a60206060850135850101610d6d565b60408201528652505060209384019301610e5c565b509095945050505050565b60008060408385031215610fc257600080fd5b823567ffffffffffffffff80821115610fda57600080fd5b610fe686838701610e1a565b93506020850135915080821115610ffc57600080fd5b5061100985828601610e1a565b9150509250929050565b828152608081016108726020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b6000825161105f8184602087016108a5565b9190910192915050565b8051600381900b811461085057600080fd5b60006020828403121561108d57600080fd5b61087282611069565b80516108508161082d565b600082601f8301126110b257600080fd5b81516110c0610b4e82610b07565b8181528460208386010111156110d557600080fd5b6109888260208301602087016108a5565b600080604083850312156110f957600080fd5b61110283611069565b9150602083015167ffffffffffffffff8082111561111f57600080fd5b9084019060a0828703121561113357600080fd5b61113b6109f2565b825161114681610af9565b815260208301516111568161082d565b602082015260408301518281111561116d57600080fd5b611179888286016110a1565b60408301525060608301518281111561119157600080fd5b61119d888286016110a1565b6060830152506111af60808401611096565b60808201528093505050509250929050565b6001600160a01b0383168152608081016108726020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b8281101561127a57888603605f1901845281518051875285015185870188905261126788880182610901565b965050928401929084019060010161123b565b50939998505050505050505050565b600081518084526020808501945080840160005b838110156112de57815180516001600160a01b03908116895284820151168489015260409081015160070b908801526060909601959082019060010161129d565b509495945050505050565b60006020808301818452808551808352604092508286019150828160051b8701018488016000805b848110156113b057898403603f19018652825180516001600160a01b0390811686528982015160608b880181905281519088018190526080880192918c01919086905b808210156113825783518051841686528e015160070b8e860152938c0193928d019260019190910190611354565b5050505090880151858203868a01529061139c8183611289565b978a01979550505091870191600101611311565b50919998505050505050505050565b60008082840360808112156113d357600080fd5b6113dc84611069565b92506060601f19820112156113f057600080fd5b506113f96109a6565b602084015161140781610a46565b815260408401516114178161082d565b60208201526060840151610ac581610a46565b6000806040838503121561143d57600080fd5b61144683611069565b91506020830151610d5081610af956fea26469706673582212202d05db674a8cf06209380a06bc351995f8633477e1c540a31fe09f1b7c885f9c64736f6c634300080b0033608060405234801561001057600080fd5b506113ef806100206000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80637c41ad2c116100665780637c41ad2c146101385780638f8d7f991461014b578063af99c6331461015e578063d614cdb814610171578063f2c31ff41461019257600080fd5b8063123973ef146100a35780633b3bff0f146100b85780633c4dd32e146100de578063593d6e82146100ff5780636fc3cbaf14610112575b600080fd5b6100b66100b1366004610990565b6101bf565b005b6100cb6100c6366004610b4f565b610224565b6040519081526020015b60405180910390f35b6100f16100ec366004610b73565b6102fe565b6040516100d5929190610c66565b6100cb61010d366004610c9c565b6103e5565b610125610120366004610da0565b6104c2565b60405160079190910b81526020016100d5565b6100cb610146366004610b4f565b6104ee565b610125610159366004610f3d565b61051c565b61012561016c366004610f3d565b610552565b61018461017f366004610b4f565b610588565b6040516100d5929190610f76565b6101a56101a0366004610f3d565b610692565b6040805160079390930b83529015156020830152016100d5565b60006101ca8261075d565b9050601681146102205760405162461bcd60e51b815260206004820152601660248201527f43727970746f205472616e73666572204661696c656400000000000000000000604482015260640160405180910390fd5b5050565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161028c9190610fb0565b6000604051808303816000865af19150503d80600081146102c9576040519150601f19603f3d011682016040523d82523d6000602084013e6102ce565b606091505b5091509150816102df5760156102f3565b808060200190518101906102f39190610fde565b60030b949350505050565b6000610308610787565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b179052905160009182916101679161036291610fb0565b6000604051808303816000865af19150503d806000811461039f576040519150601f19603f3d011682016040523d82523d6000602084013e6103a4565b606091505b50915091506103b1610787565b826103be576015816103d2565b818060200190518101906103d29190611049565b60039190910b9890975095505050505050565b60008060006101676001600160a01b031663593d6e8260e01b8686604051602401610411929190611124565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161044f9190610fb0565b6000604051808303816000865af19150503d806000811461048c576040519150601f19603f3d011682016040523d82523d6000602084013e610491565b606091505b5091509150816104a25760156104b6565b808060200190518101906104b69190610fde565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b8686604051602401610411929190611167565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b9060440161024e565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b90606401610411565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b90606401610411565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b1790529251909283918291610167916105fa9190610fb0565b6000604051808303816000865af19150503d8060008114610637576040519150601f19603f3d011682016040523d82523d6000602084013e61063c565b606091505b50604080516060810182526000808252602082018190529181019190915291935091508261066c57601581610680565b8180602001905181019061068091906111ec565b60039190910b97909650945050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b1790529051600091829182918291610167916106f491610fb0565b6000604051808303816000865af19150503d8060008114610731576040519150601f19603f3d011682016040523d82523d6000602084013e610736565b606091505b5091509150816107495760156000610680565b808060200190518101906106809190611257565b60008060006101676001600160a01b031663189a554c60e01b8560405160240161024e91906112e3565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff81118282101715610803576108036107ca565b60405290565b6040805190810167ffffffffffffffff81118282101715610803576108036107ca565b60405160a0810167ffffffffffffffff81118282101715610803576108036107ca565b604051601f8201601f1916810167ffffffffffffffff81118282101715610878576108786107ca565b604052919050565b600067ffffffffffffffff82111561089a5761089a6107ca565b5060051b60200190565b6001600160a01b03811681146108b957600080fd5b50565b80356108c7816108a4565b919050565b8035600781900b81146108c757600080fd5b600082601f8301126108ef57600080fd5b813560206109046108ff83610880565b61084f565b8281526060928302850182019282820191908785111561092357600080fd5b8387015b858110156109835781818a03121561093f5760008081fd5b6109476107e0565b8135610952816108a4565b815281860135610961816108a4565b8187015260406109728382016108cc565b908201528452928401928101610927565b5090979650505050505050565b6000602082840312156109a257600080fd5b67ffffffffffffffff80833511156109b957600080fd5b8235830184601f8201126109cc57600080fd5b6109d96108ff8235610880565b81358082526020808301929160051b8401018710156109f757600080fd5b602083015b6020843560051b850101811015610b44578481351115610a1b57600080fd5b803584016060818a03601f19011215610a3357600080fd5b610a3b6107e0565b610a4860208301356108a4565b602082013581528660408301351115610a6057600080fd5b604082013582018a603f820112610a7657600080fd5b610a866108ff6020830135610880565b602082810135808352908201919060061b83016040018d811115610aa957600080fd5b6040840193505b80841015610b04576040848f031215610ac857600080fd5b610ad0610809565b610ada85356108a4565b84358152610aea602086016108cc565b602082015280845250602083019250604084019350610ab0565b50602084015250506060820135871015610b1d57600080fd5b610b308a602060608501358501016108de565b6040820152845250602092830192016109fc565b509695505050505050565b600060208284031215610b6157600080fd5b8135610b6c816108a4565b9392505050565b60008060408385031215610b8657600080fd5b8235610b91816108a4565b946020939093013593505050565b60005b83811015610bba578181015183820152602001610ba2565b83811115610bc9576000848401525b50505050565b60008151808452610be7816020860160208601610b9f565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a06040860152610c3360a0860183610bcf565b915060608401518583036060870152610c4c8382610bcf565b925050806080850151166080860152508091505092915050565b8260070b8152604060208201526000610c826040830184610bfb565b949350505050565b63ffffffff811681146108b957600080fd5b6000808284036080811215610cb057600080fd5b8335610cbb816108a4565b92506060601f1982011215610ccf57600080fd5b50610cd86107e0565b6020840135610ce681610c8a565b81526040840135610cf6816108a4565b60208201526060840135610d0981610c8a565b6040820152919491935090915050565b80151581146108b957600080fd5b600067ffffffffffffffff821115610d4157610d416107ca565b50601f01601f191660200190565b600082601f830112610d6057600080fd5b8135610d6e6108ff82610d27565b818152846020838601011115610d8357600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610db357600080fd5b610dbd83356108a4565b82359150602083013567ffffffffffffffff80821115610ddc57600080fd5b818501915085601f830112610df057600080fd5b610dfd6108ff8335610880565b82358082526020808301929160051b85010188811115610e1c57600080fd5b602085015b81811015610f2e578481351115610e3757600080fd5b80358601601f196040828d0382011215610e5057600080fd5b610e58610809565b60208301358152604083013588811115610e7157600080fd5b929092019160a0838e0383011215610e8857600080fd5b610e9061082c565b91506020830135610ea081610d19565b82526040830135610eb0816108a4565b6020830152606083013588811115610ec757600080fd5b610ed68e602083870101610d4f565b604084015250608083013588811115610eee57600080fd5b610efd8e602083870101610d4f565b606084015250610f0f60a084016108bc565b6080830152602081810192909252865294850194919091019050610e21565b50959890975095505050505050565b60008060408385031215610f5057600080fd5b8235610f5b816108a4565b91506020830135610f6b816108a4565b809150509250929050565b82815260808101610b6c6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b60008251610fc2818460208701610b9f565b9190910192915050565b8051600381900b81146108c757600080fd5b600060208284031215610ff057600080fd5b610b6c82610fcc565b80516108c7816108a4565b600082601f83011261101557600080fd5b81516110236108ff82610d27565b81815284602083860101111561103857600080fd5b610c82826020830160208701610b9f565b6000806040838503121561105c57600080fd5b61106583610fcc565b9150602083015167ffffffffffffffff8082111561108257600080fd5b9084019060a0828703121561109657600080fd5b61109e61082c565b82516110a981610d19565b815260208301516110b9816108a4565b60208201526040830151828111156110d057600080fd5b6110dc88828601611004565b6040830152506060830151828111156110f457600080fd5b61110088828601611004565b60608301525061111260808401610ff9565b60808201528093505050509250929050565b6001600160a01b038316815260808101610b6c6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b828110156111dd57888603605f190184528151805187528501518587018890526111ca88880182610bfb565b965050928401929084019060010161119e565b50939998505050505050505050565b600080828403608081121561120057600080fd5b61120984610fcc565b92506060601f198201121561121d57600080fd5b506112266107e0565b602084015161123481610c8a565b81526040840151611244816108a4565b60208201526060840151610d0981610c8a565b6000806040838503121561126a57600080fd5b61127383610fcc565b91506020830151610f6b81610d19565b600081518084526020808501945080840160005b838110156112d857815180516001600160a01b03908116895284820151168489015260409081015160070b9088015260609096019590820190600101611297565b509495945050505050565b60006020808301818452808551808352604092508286019150828160051b8701018488016000805b848110156113aa57898403603f19018652825180516001600160a01b0390811686528982015160608b880181905281519088018190526080880192918c01919086905b8082101561137c5783518051841686528e015160070b8e860152938c0193928d01926001919091019061134e565b5050505090880151858203868a0152906113968183611283565b978a0197955050509187019160010161130b565b5091999850505050505050505056fea264697066735822122075b40797cdd3cdcf2aee1f48a3e0f63a4b6f4a717c4608bf0f10cdedf5df242364736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.json b/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.json
deleted file mode 100644
index 775560fb13e2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.json
+++ /dev/null
@@ -1,433 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers",
-        "type": "tuple[]"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers2",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "cryptoTransferV1LazyCreate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.bin
deleted file mode 100644
index b4acd053ef52..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161001d9061005f565b604051809103906000f080158015610039573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b039290921691909117905561006c565b610a8780610ba883390190565b610b2d8061007b6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806311e1fc071461005c57806315dacbea1461008657806360c14918146100995780639b23d3d9146100ae578063eac6f3fe146100c1575b600080fd5b61006f61006a366004610486565b6100d4565b60405160079190910b815260200160405180910390f35b61006f610094366004610486565b6101b5565b6100ac6100a736600461085f565b610260565b005b61006f6100bc366004610486565b61032d565b61006f6100cf366004610486565b61035d565b60008060006101676001600160a01b0316639b23d3d960e01b88888888604051602401610104949392919061090c565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516101429190610936565b600060405180830381855af49150503d806000811461017d576040519150601f19603f3d011682016040523d82523d6000602084013e610182565b606091505b5091509150816101935760156101a7565b808060200190518101906101a79190610971565b60030b979650505050505050565b60008060006101676001600160a01b03166315dacbea60e01b888888886040516024016101e5949392919061090c565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102239190610936565b6000604051808303816000865af19150503d806000811461017d576040519150601f19603f3d011682016040523d82523d6000602084013e610182565b600054604051630b13fbaf60e21b81526001600160a01b0390911690632c4feebc9061029290879087906004016109fa565b600060405180830381600087803b1580156102ac57600080fd5b505af11580156102c0573d6000803e3d6000fd5b5050505060006102d0838361038d565b9050601681146103265760405162461bcd60e51b815260206004820152601660248201527f43727970746f205472616e73666572204661696c656400000000000000000000604482015260640160405180910390fd5b5050505050565b60008060006101676001600160a01b0316639b23d3d960e01b888888886040516024016101e5949392919061090c565b60008060006101676001600160a01b03166315dacbea60e01b88888888604051602401610104949392919061090c565b60008060006101676001600160a01b0316630e71804f60e01b86866040516024016103b99291906109fa565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516103f79190610936565b6000604051808303816000865af19150503d8060008114610434576040519150601f19603f3d011682016040523d82523d6000602084013e610439565b606091505b50915091508161044a57601561045e565b8080602001905181019061045e9190610971565b60030b95945050505050565b80356001600160a01b038116811461048157600080fd5b919050565b6000806000806080858703121561049c57600080fd5b6104a58561046a565b93506104b36020860161046a565b92506104c16040860161046a565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff8111828210171561050a5761050a6104d1565b60405290565b6040516080810167ffffffffffffffff8111828210171561050a5761050a6104d1565b604051601f8201601f1916810167ffffffffffffffff8111828210171561055c5761055c6104d1565b604052919050565b600067ffffffffffffffff82111561057e5761057e6104d1565b5060051b60200190565b8035600781900b811461048157600080fd5b8035801515811461048157600080fd5b600082601f8301126105bb57600080fd5b813560206105d06105cb83610564565b610533565b828152606092830285018201928282019190878511156105ef57600080fd5b8387015b8581101561064b5781818a03121561060b5760008081fd5b6106136104e7565b61061c8261046a565b8152610629868301610588565b86820152604061063a81840161059a565b9082015284529284019281016105f3565b5090979650505050505050565b60006020828403121561066a57600080fd5b6040516020810167ffffffffffffffff828210818311171561068e5761068e6104d1565b8160405282935084359150808211156106a657600080fd5b506106b3858286016105aa565b8252505092915050565b600082601f8301126106ce57600080fd5b813560206106de6105cb83610564565b82815260059290921b840181019181810190868411156106fd57600080fd5b8286015b8481101561085457803567ffffffffffffffff8082111561072157600080fd5b908801906060828b03601f1901121561073957600080fd5b6107416104e7565b61074c87840161046a565b81526040808401358381111561076157600080fd5b61076f8d8a838801016105aa565b898401525060608401358381111561078657600080fd5b8085019450508b603f85011261079b57600080fd5b8784013592506107ad6105cb84610564565b83815260079390931b8401810192888101908d8511156107cc57600080fd5b948201945b8486101561083d576080868f0312156107e957600080fd5b6107f1610510565b6107fa8761046a565b81526108078b880161046a565b8b820152610816848801610588565b848201526108266060880161059a565b6060820152825260809590950194908901906107d1565b918301919091525085525050918301918301610701565b509695505050505050565b6000806000806080858703121561087557600080fd5b843567ffffffffffffffff8082111561088d57600080fd5b61089988838901610658565b955060208701359150808211156108af57600080fd5b6108bb888389016106bd565b945060408701359150808211156108d157600080fd5b6108dd88838901610658565b935060608701359150808211156108f357600080fd5b50610900878288016106bd565b91505092959194509250565b6001600160a01b039485168152928416602084015292166040820152606081019190915260800190565b6000825160005b81811015610957576020818601810151858301520161093d565b81811115610966576000828501525b509190910192915050565b60006020828403121561098357600080fd5b81518060030b811461099457600080fd5b9392505050565b600081518084526020808501945080840160005b838110156109ef57815180516001600160a01b031688528381015160070b84890152604090810151151590880152606090960195908201906001016109af565b509495945050505050565b600060408083526060855160208084870152610a188387018361099b565b9150858203818701528187518084528284019150828160051b850101838a0160005b83811015610ae657601f1987840301855281516001600160a01b03808251168552878201518a89870152610a708b87018261099b565b928c0151868403878e01528051808552908a0193600092508a01905b80831015610ad05784518051851683528b81015185168c8401528e81015160070b8f8401528d015115158d830152938a019360019290920191608090910190610a8c565b5097890197955050509186019150600101610a3a565b50909b9a505050505050505050505056fea2646970667358221220584ec97eaf9c77fab7d8e203eedcf7b850584030be40715053a73886d797db7964736f6c634300080b0033608060405234801561001057600080fd5b50610a67806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806311e1fc071461005c57806315dacbea146100865780632c4feebc146100995780639b23d3d9146100ae578063eac6f3fe146100c1575b600080fd5b61006f61006a366004610420565b6100d4565b60405160079190910b815260200160405180910390f35b61006f610094366004610420565b6101b5565b6100ac6100a7366004610615565b610260565b005b61006f6100bc366004610420565b6102c7565b61006f6100cf366004610420565b6102f7565b60008060006101676001600160a01b0316639b23d3d960e01b888888886040516024016101049493929190610846565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516101429190610870565b600060405180830381855af49150503d806000811461017d576040519150601f19603f3d011682016040523d82523d6000602084013e610182565b606091505b5091509150816101935760156101a7565b808060200190518101906101a791906108ab565b60030b979650505050505050565b60008060006101676001600160a01b03166315dacbea60e01b888888886040516024016101e59493929190610846565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102239190610870565b6000604051808303816000865af19150503d806000811461017d576040519150601f19603f3d011682016040523d82523d6000602084013e610182565b600061026c8383610327565b9050601681146102c25760405162461bcd60e51b815260206004820152601660248201527f43727970746f205472616e73666572204661696c656400000000000000000000604482015260640160405180910390fd5b505050565b60008060006101676001600160a01b0316639b23d3d960e01b888888886040516024016101e59493929190610846565b60008060006101676001600160a01b03166315dacbea60e01b888888886040516024016101049493929190610846565b60008060006101676001600160a01b0316630e71804f60e01b8686604051602401610353929190610934565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516103919190610870565b6000604051808303816000865af19150503d80600081146103ce576040519150601f19603f3d011682016040523d82523d6000602084013e6103d3565b606091505b5091509150816103e45760156103f8565b808060200190518101906103f891906108ab565b60030b95945050505050565b80356001600160a01b038116811461041b57600080fd5b919050565b6000806000806080858703121561043657600080fd5b61043f85610404565b935061044d60208601610404565b925061045b60408601610404565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff811182821017156104a4576104a461046b565b60405290565b6040516020810167ffffffffffffffff811182821017156104a4576104a461046b565b6040516080810167ffffffffffffffff811182821017156104a4576104a461046b565b604051601f8201601f1916810167ffffffffffffffff811182821017156105195761051961046b565b604052919050565b600067ffffffffffffffff82111561053b5761053b61046b565b5060051b60200190565b8035600781900b811461041b57600080fd5b8035801515811461041b57600080fd5b600082601f83011261057857600080fd5b8135602061058d61058883610521565b6104f0565b828152606092830285018201928282019190878511156105ac57600080fd5b8387015b858110156106085781818a0312156105c85760008081fd5b6105d0610481565b6105d982610404565b81526105e6868301610545565b8682015260406105f7818401610557565b9082015284529284019281016105b0565b5090979650505050505050565b6000806040838503121561062857600080fd5b67ffffffffffffffff808435111561063f57600080fd5b6020843585018603121561065257600080fd5b61065a6104aa565b818535860135111561066b57600080fd5b61067b8686358701803501610567565b81529250602084013581101561069057600080fd5b6020840135840185601f8201126106a657600080fd5b6106b36105888235610521565b81358082526020808301929160051b8401018810156106d157600080fd5b602083015b6020843560051b8501018110156108375784813511156106f557600080fd5b803584016060818b03601f1901121561070d57600080fd5b610715610481565b61072160208301610404565b8152866040830135111561073457600080fd5b6107478b60206040850135850101610567565b6020820152866060830135111561075d57600080fd5b6060820135820191508a603f83011261077557600080fd5b6107856105886020840135610521565b602083810135808352908201919060071b84016040018d8111156107a857600080fd5b6040850194505b80851015610821576080858f0312156107c757600080fd5b6107cf6104cd565b6107d886610404565b81526107e660208701610404565b60208201526107f760408701610545565b604082015261080860608701610557565b60608201528352608094909401936020909201916107af565b50604083015250845250602092830192016106d6565b50809450505050509250929050565b6001600160a01b039485168152928416602084015292166040820152606081019190915260800190565b6000825160005b818110156108915760208186018101518583015201610877565b818111156108a0576000828501525b509190910192915050565b6000602082840312156108bd57600080fd5b81518060030b81146108ce57600080fd5b9392505050565b600081518084526020808501945080840160005b8381101561092957815180516001600160a01b031688528381015160070b84890152604090810151151590880152606090960195908201906001016108e9565b509495945050505050565b600060408083526060855160208084870152610952838701836108d5565b9150858203818701528187518084528284019150828160051b850101838a0160005b83811015610a2057601f1987840301855281516001600160a01b03808251168552878201518a898701526109aa8b8701826108d5565b928c0151868403878e01528051808552908a0193600092508a01905b80831015610a0a5784518051851683528b81015185168c8401528e81015160070b8f8401528d015115158d830152938a0193600192909201916080909101906109c6565b5097890197955050509186019150600101610974565b50909b9a505050505050505050505056fea2646970667358221220978a728788eedc18571cce967805ff841bb985d226538384b13a2c954299edfc64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.json b/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.json
deleted file mode 100644
index 12a600fd2e89..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.json
+++ /dev/null
@@ -1,331 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TransferList",
-        "name": "transferList",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers",
-        "type": "tuple[]"
-      },
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TransferList",
-        "name": "transferList2",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers2",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "cryptoTransferV2LazyCreate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.bin
deleted file mode 100644
index 1a7697fa8860..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610399806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80632a4c08961461005c57806378b9a1f314610078578063c670f86414610094578063c683d6a3146100b0578063d05285d4146100cc575b600080fd5b61007660048036038101906100719190610212565b6100e8565b005b610092600480360381019061008d9190610265565b61011c565b005b6100ae60048036038101906100a991906102a5565b61014e565b005b6100ca60048036038101906100c591906102d2565b61017e565b005b6100e660048036038101906100e191906102a5565b6101be565b005b8082847fa8fb2f9a49afc2ea148319326c7208965555151db2ce137c05174098730aedc360405160405180910390a4505050565b80827f513dad7582fd8b11c8f4d05e6e7ac8caaa5eb690e9173dd2bed96b5ae0e0d02460405160405180910390a35050565b807f46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a860405160405180910390a250565b8183857f75e7d95cd72588af49ce2e4b7f004bce916d422999adf262a640e4239aab00c7846040516101b09190610348565b60405180910390a450505050565b806040516101cc9190610348565b60405180910390a050565b600080fd5b6000819050919050565b6101ef816101dc565b81146101fa57600080fd5b50565b60008135905061020c816101e6565b92915050565b60008060006060848603121561022b5761022a6101d7565b5b6000610239868287016101fd565b935050602061024a868287016101fd565b925050604061025b868287016101fd565b9150509250925092565b6000806040838503121561027c5761027b6101d7565b5b600061028a858286016101fd565b925050602061029b858286016101fd565b9150509250929050565b6000602082840312156102bb576102ba6101d7565b5b60006102c9848285016101fd565b91505092915050565b600080600080608085870312156102ec576102eb6101d7565b5b60006102fa878288016101fd565b945050602061030b878288016101fd565b935050604061031c878288016101fd565b925050606061032d878288016101fd565b91505092959194509250565b610342816101dc565b82525050565b600060208201905061035d6000830184610339565b9291505056fea26469706673582212204466d60f99197e606b37aac03c9b5774b919c45ffe69781a2fb8a28f58c9b61464736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.json
deleted file mode 100644
index 61d663ebf5e6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.json
+++ /dev/null
@@ -1,198 +0,0 @@
-[
-  {
-    "anonymous": true,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "num1",
-        "type": "uint256"
-      }
-    ],
-    "name": "Log0",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num0",
-        "type": "uint256"
-      }
-    ],
-    "name": "Log1",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num0",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num1",
-        "type": "uint256"
-      }
-    ],
-    "name": "Log2",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num0",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num1",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num2",
-        "type": "uint256"
-      }
-    ],
-    "name": "Log3",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num0",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num1",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "num2",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "num3",
-        "type": "uint256"
-      }
-    ],
-    "name": "Log4",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "log0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "log1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n0",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n1",
-        "type": "uint256"
-      }
-    ],
-    "name": "log2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n0",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n1",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n2",
-        "type": "uint256"
-      }
-    ],
-    "name": "log3",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n0",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n1",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n2",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n3",
-        "type": "uint256"
-      }
-    ],
-    "name": "log4",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.sol b/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.sol
deleted file mode 100644
index c76d46122c1b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Logs/Logs.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.0;
-
-contract Logs {
-
-    event Log0(uint256 num1) anonymous; // Does not include topic
-    event Log1(uint256 indexed num0);
-    event Log2(uint256 indexed num0, uint256 indexed num1);
-    event Log3(uint256 indexed num0, uint256 indexed num1, uint256 indexed num2);
-    event Log4(uint256 indexed num0, uint256 indexed num1, uint256 indexed num2, uint256 num3);
-
-    function log0(uint n) public {
-        emit Log0(n);
-    }
-
-    function log1(uint n) public {
-        emit Log1(n);
-    }
-
-    function log2(uint n0, uint n1) public {
-        emit Log2(n0, n1);
-    }
-
-    function log3(uint n0, uint n1, uint n2) public {
-        emit Log3(n0, n1, n2);
-    }
-
-    function log4(uint n0, uint n1, uint n2, uint n3) public {
-        emit Log4(n0, n1, n2, n3);
-    }
-}
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.bin
deleted file mode 100644
index cfd7e0ee1225..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610489806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063194f12bd1461003b57806346c1b5441461006c575b600080fd5b610055600480360381019061005091906102ac565b61009d565b6040516100639291906103cb565b60405180910390f35b610086600480360381019061008191906102ac565b610128565b6040516100949291906103cb565b60405180910390f35b600060608573ffffffffffffffffffffffffffffffffffffffff168386866040516100c992919061043a565b60006040518083038160008787f1925050503d8060008114610107576040519150601f19603f3d011682016040523d82523d6000602084013e61010c565b606091505b5080925081935050508161011f57600080fd5b94509492505050565b600060608573ffffffffffffffffffffffffffffffffffffffff1683868660405161015492919061043a565b60006040518083038160008787f1925050503d8060008114610192576040519150601f19603f3d011682016040523d82523d6000602084013e610197565b606091505b50809250819350505094509492505050565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101de826101b3565b9050919050565b6101ee816101d3565b81146101f957600080fd5b50565b60008135905061020b816101e5565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f84011261023657610235610211565b5b8235905067ffffffffffffffff81111561025357610252610216565b5b60208301915083600182028301111561026f5761026e61021b565b5b9250929050565b6000819050919050565b61028981610276565b811461029457600080fd5b50565b6000813590506102a681610280565b92915050565b600080600080606085870312156102c6576102c56101a9565b5b60006102d4878288016101fc565b945050602085013567ffffffffffffffff8111156102f5576102f46101ae565b5b61030187828801610220565b9350935050604061031487828801610297565b91505092959194509250565b60008115159050919050565b61033581610320565b82525050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561037557808201518184015260208101905061035a565b60008484015250505050565b6000601f19601f8301169050919050565b600061039d8261033b565b6103a78185610346565b93506103b7818560208601610357565b6103c081610381565b840191505092915050565b60006040820190506103e0600083018561032c565b81810360208301526103f28184610392565b90509392505050565b600081905092915050565b82818337600083830152505050565b600061042183856103fb565b935061042e838584610406565b82840190509392505050565b6000610447828486610415565b9150819050939250505056fea26469706673582212209bb6cc2e4937718f963b6070106855fae53276cfe99fbf8a1809455f9663ccde64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.json b/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.json
deleted file mode 100644
index 7caa7d8ed390..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"bytes","name":"payload","type":"bytes"},{"internalType":"uint256","name":"gasAmount","type":"uint256"}],"name":"callRequested","outputs":[{"internalType":"bool","name":"success","type":"bool"},{"internalType":"bytes","name":"result","type":"bytes"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"bytes","name":"payload","type":"bytes"},{"internalType":"uint256","name":"gasAmount","type":"uint256"}],"name":"callRequestedAndIgnoreFailure","outputs":[{"internalType":"bool","name":"success","type":"bool"},{"internalType":"bytes","name":"result","type":"bytes"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.bin
deleted file mode 100644
index 0ba787ed1191..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561000f575f80fd5b506104d18061001d5f395ff3fe608060405260043610610028575f3560e01c80637e38d3a31461002c5780639154822814610069575b5f80fd5b348015610037575f80fd5b50610052600480360381019061004d919061032f565b61009a565b60405161006092919061041d565b60405180910390f35b610083600480360381019061007e919061032f565b610110565b60405161009192919061041d565b60405180910390f35b5f60608373ffffffffffffffffffffffffffffffffffffffff16836040516100c29190610485565b5f604051808303815f865af19150503d805f81146100fb576040519150601f19603f3d011682016040523d82523d5f602084013e610100565b606091505b5080925081935050509250929050565b5f60608373ffffffffffffffffffffffffffffffffffffffff1634846040516101399190610485565b5f6040518083038185875af1925050503d805f8114610173576040519150601f19603f3d011682016040523d82523d5f602084013e610178565b606091505b5080925081935050509250929050565b5f604051905090565b5f80fd5b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f6101c282610199565b9050919050565b6101d2816101b8565b81146101dc575f80fd5b50565b5f813590506101ed816101c9565b92915050565b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b610241826101fb565b810181811067ffffffffffffffff821117156102605761025f61020b565b5b80604052505050565b5f610272610188565b905061027e8282610238565b919050565b5f67ffffffffffffffff82111561029d5761029c61020b565b5b6102a6826101fb565b9050602081019050919050565b828183375f83830152505050565b5f6102d36102ce84610283565b610269565b9050828152602081018484840111156102ef576102ee6101f7565b5b6102fa8482856102b3565b509392505050565b5f82601f830112610316576103156101f3565b5b81356103268482602086016102c1565b91505092915050565b5f806040838503121561034557610344610191565b5b5f610352858286016101df565b925050602083013567ffffffffffffffff81111561037357610372610195565b5b61037f85828601610302565b9150509250929050565b5f8115159050919050565b61039d81610389565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b838110156103da5780820151818401526020810190506103bf565b5f8484015250505050565b5f6103ef826103a3565b6103f981856103ad565b93506104098185602086016103bd565b610412816101fb565b840191505092915050565b5f6040820190506104305f830185610394565b818103602083015261044281846103e5565b90509392505050565b5f81905092915050565b5f61045f826103a3565b610469818561044b565b93506104798185602086016103bd565b80840191505092915050565b5f6104908284610455565b91508190509291505056fea2646970667358221220024b087a39503641d853603076a748cfedfd8eeda00fd4452e7514ca1e9b375c64736f6c63430008180033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.json
deleted file mode 100644
index 843cf6cc835d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.json
+++ /dev/null
@@ -1,60 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "makeCallWithAmount",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "returnData",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "makeCallWithoutAmount",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "returnData",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.bin
deleted file mode 100644
index 358c8f4a90a2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061059d806100206000396000f3fe6080604052600436106100345760003560e01c80632e68d05014610039578063446aa88b14610062578063afa10dca1461007e575b600080fd5b34801561004557600080fd5b50610060600480360381019061005b919061028c565b6100a7565b005b61007c6004803603810190610077919061031d565b610146565b005b34801561008a57600080fd5b506100a560048036038101906100a0919061034a565b610190565b005b60005b81811015610140578373ffffffffffffffffffffffffffffffffffffffff166370a08231846040518263ffffffff1660e01b81526004016100eb9190610386565b602060405180830381865afa158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c91906103b6565b50808061013890610412565b9150506100aa565b50505050565b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f1935050505015801561018c573d6000803e3d6000fd5b5050565b60005b818110156101e357806040516101a8906101e7565b6101b29190610469565b604051809103906000f0801580156101ce573d6000803e3d6000fd5b505080806101db90610412565b915050610193565b5050565b60e38061048583390190565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610223826101f8565b9050919050565b61023381610218565b811461023e57600080fd5b50565b6000813590506102508161022a565b92915050565b6000819050919050565b61026981610256565b811461027457600080fd5b50565b60008135905061028681610260565b92915050565b6000806000606084860312156102a5576102a46101f3565b5b60006102b386828701610241565b93505060206102c486828701610241565b92505060406102d586828701610277565b9150509250925092565b60006102ea826101f8565b9050919050565b6102fa816102df565b811461030557600080fd5b50565b600081359050610317816102f1565b92915050565b600060208284031215610333576103326101f3565b5b600061034184828501610308565b91505092915050565b6000602082840312156103605761035f6101f3565b5b600061036e84828501610277565b91505092915050565b61038081610218565b82525050565b600060208201905061039b6000830184610377565b92915050565b6000815190506103b081610260565b92915050565b6000602082840312156103cc576103cb6101f3565b5b60006103da848285016103a1565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061041d82610256565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361044f5761044e6103e3565b5b600182019050919050565b61046381610256565b82525050565b600060208201905061047e600083018461045a565b9291505056fe6080604052348015600f57600080fd5b5060405160e338038060e38339818101604052810190602d9190606f565b80600081905550506097565b600080fd5b6000819050919050565b604f81603e565b8114605957600080fd5b50565b6000815190506069816048565b92915050565b60006020828403121560825760816039565b5b6000608e84828501605c565b91505092915050565b603f8060a46000396000f3fe6080604052600080fdfea264697066735822122075f36ed9ba731158d1d0d9ae97b3c5b8d8febdb48b0589555d46dbfc7bab46cd64736f6c63430008100033a2646970667358221220989ee066b557f2efe3725b9e28c498151a02d399015a5879bb7d340eb36fcc4164736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.json
deleted file mode 100644
index 417f88f63037..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"},{"internalType":"uint256","name":"timesToCheck","type":"uint256"}],"name":"checkBalanceRepeatedly","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"thingsToCreate","type":"uint256"}],"name":"createThingsRepeatedly","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address payable","name":"beneficiary","type":"address"}],"name":"sendSomeValueTo","outputs":[],"stateMutability":"payable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.bin
deleted file mode 100644
index 1ca9d794319d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526001600260006101000a81548163ffffffff021916908363ffffffff160217905550612710600260046101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506040518060400160405280600481526020017f4d454d4f0000000000000000000000000000000000000000000000000000000081525060039081620000979190620004ff565b50348015620000a557600080fd5b506001806000806006811115620000c157620000c0620005e6565b5b6006811115620000d657620000d5620005e6565b5b81526020019081526020016000208190555060026001600060016006811115620001055762000104620005e6565b5b60068111156200011a5762000119620005e6565b5b81526020019081526020016000208190555060046001600060026006811115620001495762000148620005e6565b5b60068111156200015e576200015d620005e6565b5b815260200190815260200160002081905550600860016000600360068111156200018d576200018c620005e6565b5b6006811115620001a257620001a1620005e6565b5b81526020019081526020016000208190555060106001600060046006811115620001d157620001d0620005e6565b5b6006811115620001e657620001e5620005e6565b5b81526020019081526020016000208190555060206001600060056006811115620002155762000214620005e6565b5b60068111156200022a5762000229620005e6565b5b815260200190815260200160002081905550604060016000600680811115620002585762000257620005e6565b5b60068111156200026d576200026c620005e6565b5b81526020019081526020016000208190555062000615565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200030757607f821691505b6020821081036200031d576200031c620002bf565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b600060088302620003877fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000348565b62000393868362000348565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620003e0620003da620003d484620003ab565b620003b5565b620003ab565b9050919050565b6000819050919050565b620003fc83620003bf565b620004146200040b82620003e7565b84845462000355565b825550505050565b600090565b6200042b6200041c565b62000438818484620003f1565b505050565b5b8181101562000460576200045460008262000421565b6001810190506200043e565b5050565b601f821115620004af57620004798162000323565b620004848462000338565b8101602085101562000494578190505b620004ac620004a38562000338565b8301826200043d565b50505b505050565b600082821c905092915050565b6000620004d460001984600802620004b4565b1980831691505092915050565b6000620004ef8383620004c1565b9150826002028217905092915050565b6200050a8262000285565b67ffffffffffffffff81111562000526576200052562000290565b5b620005328254620002ee565b6200053f82828562000464565b600060209050601f83116001811462000577576000841562000562578287015190505b6200056e8582620004e1565b865550620005de565b601f198416620005878662000323565b60005b82811015620005b1578489015182556001820191506020850194506020810190506200058a565b86831015620005d15784890151620005cd601f891682620004c1565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b61558280620006256000396000f3fe6080604052600436106100f35760003560e01c80638f8d7f991161008a578063d614cdb811610059578063d614cdb814610378578063d8723ec3146103b6578063da908742146103e6578063f2c31ff414610416576100f3565b80638f8d7f99146102a55780639b23d3d9146102e2578063a90c27401461031f578063af99c6331461033b576100f3565b8063503afe2f116100c6578063503afe2f146101df578063593d6e82146101fb578063677ad212146102385780637c41ad2c14610268576100f3565b806315dacbea146100f857806318370d3414610135578063217e83b0146101725780633b3bff0f146101a2575b600080fd5b34801561010457600080fd5b5061011f600480360381019061011a9190611c59565b610454565b60405161012c9190611cdc565b60405180910390f35b34801561014157600080fd5b5061015c60048036038101906101579190612352565b610572565b60405161016991906123c7565b60405180910390f35b61018c600480360381019061018791906123e2565b61068a565b6040516101999190612431565b60405180910390f35b3480156101ae57600080fd5b506101c960048036038101906101c4919061244c565b610740565b6040516101d691906123c7565b60405180910390f35b6101f960048036038101906101f49190612479565b610855565b005b34801561020757600080fd5b50610222600480360381019061021d91906124cc565b6108cf565b60405161022f91906123c7565b60405180910390f35b610252600480360381019061024d919061250c565b6109e7565b60405161025f9190612431565b60405180910390f35b34801561027457600080fd5b5061028f600480360381019061028a919061244c565b610b29565b60405161029c91906123c7565b60405180910390f35b3480156102b157600080fd5b506102cc60048036038101906102c7919061255f565b610c3e565b6040516102d99190611cdc565b60405180910390f35b3480156102ee57600080fd5b5061030960048036038101906103049190611c59565b610d56565b6040516103169190611cdc565b60405180910390f35b6103396004803603810190610334919061255f565b610e74565b005b34801561034757600080fd5b50610362600480360381019061035d919061255f565b610ed5565b60405161036f9190611cdc565b60405180910390f35b34801561038457600080fd5b5061039f600480360381019061039a919061244c565b610fed565b6040516103ad9291906125ff565b60405180910390f35b6103d060048036038101906103cb91906123e2565b61111d565b6040516103dd9190612431565b60405180910390f35b61040060048036038101906103fb919061250c565b61117f565b60405161040d9190612431565b60405180910390f35b34801561042257600080fd5b5061043d6004803603810190610438919061255f565b6112c5565b60405161044b929190612637565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401610491949392919061266f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104fb9190612725565b6000604051808303816000865af19150503d8060008114610538576040519150601f19603f3d011682016040523d82523d6000602084013e61053d565b606091505b50915091508161054e576015610563565b808060200190518101906105629190612775565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166318370d3460e01b86866040516024016105ab929190612b06565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106159190612725565b6000604051808303816000865af19150503d8060008114610652576040519150601f19603f3d011682016040523d82523d6000602084013e610657565b606091505b50915091508161066857601561067d565b8080602001905181019061067c9190612775565b5b60030b9250505092915050565b600080604051610699906119aa565b604051809103906000f0801580156106b5573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663d8723ec33486866040518463ffffffff1660e01b81526004016106f4929190612b45565b60206040518083038185885af1158015610712573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906107379190612b83565b91505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b856040516024016107779190612431565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107e19190612725565b6000604051808303816000865af19150503d806000811461081e576040519150601f19603f3d011682016040523d82523d6000602084013e610823565b606091505b509150915081610834576015610849565b808060200190518101906108489190612775565b5b60030b92505050919050565b61085d6119b7565b82816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505081816040019063ffffffff16908163ffffffff168152505060006108b985836108cf565b9050601681146108c857600080fd5b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663593d6e8260e01b8686604051602401610908929190612bb0565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109729190612725565b6000604051808303816000865af19150503d80600081146109af576040519150601f19603f3d011682016040523d82523d6000602084013e6109b4565b606091505b5091509150816109c55760156109da565b808060200190518101906109d99190612775565b5b60030b9250505092915050565b6000806109f485856113ea565b905060008067ffffffffffffffff811115610a1257610a11611d0d565b5b604051908082528060200260200182016040528015610a4b57816020015b610a386119fa565b815260200190600190039081610a305790505b5090506000600167ffffffffffffffff811115610a6b57610a6a611d0d565b5b604051908082528060200260200182016040528015610aa457816020015b610a91611a60565b815260200190600190039081610a895790505b509050610ab2600a866115af565b81600081518110610ac657610ac5612bd9565b5b6020026020010181905250600080610b0985600260049054906101000a900467ffffffffffffffff16600260009054906101000a900463ffffffff16868861161e565b9150915060168214610b1a57600080fd5b80955050505050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b85604051602401610b609190612431565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610bca9190612725565b6000604051808303816000865af19150503d8060008114610c07576040519150601f19603f3d011682016040523d82523d6000602084013e610c0c565b606091505b509150915081610c1d576015610c32565b80806020019051810190610c319190612775565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8686604051602401610c77929190612c08565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610ce19190612725565b6000604051808303816000865af19150503d8060008114610d1e576040519150601f19603f3d011682016040523d82523d6000602084013e610d23565b606091505b509150915081610d34576015610d49565b80806020019051810190610d489190612775565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b88888888604051602401610d93949392919061266f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610dfd9190612725565b6000604051808303816000865af19150503d8060008114610e3a576040519150601f19603f3d011682016040523d82523d6000602084013e610e3f565b606091505b509150915081610e50576015610e65565b80806020019051810190610e649190612775565b5b60030b92505050949350505050565b610e7c611ac5565b81816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506000610ec08483610572565b905060168114610ecf57600080fd5b50505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b8686604051602401610f0e929190612c08565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f789190612725565b6000604051808303816000865af19150503d8060008114610fb5576040519150601f19603f3d011682016040523d82523d6000602084013e610fba565b606091505b509150915081610fcb576015610fe0565b80806020019051810190610fdf9190612775565b5b60030b9250505092915050565b6000610ff76119b7565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663d614cdb860e01b8660405160240161102c9190612431565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110969190612725565b6000604051808303816000865af19150503d80600081146110d3576040519150601f19603f3d011682016040523d82523d6000602084013e6110d8565b606091505b50915091506110e56119b7565b826110f257601581611107565b818060200190518101906111069190612caa565b5b8160030b91508095508196505050505050915091565b60008061112a84846113ea565b905060008061116283600260049054906101000a900467ffffffffffffffff16600260009054906101000a900463ffffffff166117a3565b915091506016821461117357600080fd5b80935050505092915050565b60008061118c85856113ea565b90506000600167ffffffffffffffff8111156111ab576111aa611d0d565b5b6040519080825280602002602001820160405280156111e457816020015b6111d16119fa565b8152602001906001900390816111c95790505b5090506111f66001600a600087611922565b8160008151811061120a57611209612bd9565b5b602002602001018190525060008067ffffffffffffffff81111561123157611230611d0d565b5b60405190808252806020026020018201604052801561126a57816020015b611257611a60565b81526020019060019003908161124f5790505b5090506000806112a585600260049054906101000a900467ffffffffffffffff16600260009054906101000a900463ffffffff16868861161e565b91509150601682146112b657600080fd5b80955050505050509392505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663f2c31ff460e01b87876040516024016112ff929190612c08565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516113699190612725565b6000604051808303816000865af19150503d80600081146113a6576040519150601f19603f3d011682016040523d82523d6000602084013e6113ab565b606091505b5091509150816113be57601560006113d3565b808060200190518101906113d29190612cff565b5b8160030b9150809450819550505050509250929050565b6113f2611ac5565b60008067ffffffffffffffff81111561140e5761140d611d0d565b5b60405190808252806020026020018201604052801561144757816020015b611434611b34565b81526020019060019003908161142c5790505b5090506114526119b7565b84816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505083816040019063ffffffff16908163ffffffff16815250506040518060400160405280600481526020017f4e414d450000000000000000000000000000000000000000000000000000000081525083600001819052506040518060400160405280600681526020017f53594d424f4c0000000000000000000000000000000000000000000000000000815250836020018190525030836040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050818360e00181905250808361010001819052506040518060400160405280600481526020017f4d454d4f000000000000000000000000000000000000000000000000000000008152508360600181905250505092915050565b6115b7611a60565b82816000019063ffffffff16908163ffffffff1681525050600181606001901515908115158152505081816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505092915050565b6000808660008161010001516000015163ffffffff16148015611650575060008161010001516040015163ffffffff16145b15611676576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463b937581a60e01b8c8c8c8c8c6040516024016116b4959493929190612fa3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161171e9190612725565b60006040518083038185875af1925050503d806000811461175b576040519150601f19603f3d011682016040523d82523d6000602084013e611760565b606091505b5091509150816117735760156000611788565b808060200190518101906117879190613049565b5b8160030b915080955081965050505050509550959350505050565b6000808460008161010001516000015163ffffffff161480156117d5575060008161010001516040015163ffffffff16145b156117fb576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463c23baeb660e01b8a8a8a60405160240161183593929190613089565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161189f9190612725565b60006040518083038185875af1925050503d80600081146118dc576040519150601f19603f3d011682016040523d82523d6000602084013e6118e1565b606091505b5091509150816118f45760156000611909565b808060200190518101906119089190613049565b5b8160030b91508095508196505050505050935093915050565b61192a6119fa565b84816000019063ffffffff16908163ffffffff168152505083816020019063ffffffff16908163ffffffff168152505082816080019015159081151581525050818160a0019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050949350505050565b612485806130c883390190565b6040518060600160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600063ffffffff1681525090565b6040518060c00160405280600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518060a00160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b815260200160001515815260200160608152602001611b2e6119b7565b81525090565b604051806040016040528060008152602001611b4e611b54565b81525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611bf082611bc5565b9050919050565b611c0081611be5565b8114611c0b57600080fd5b50565b600081359050611c1d81611bf7565b92915050565b6000819050919050565b611c3681611c23565b8114611c4157600080fd5b50565b600081359050611c5381611c2d565b92915050565b60008060008060808587031215611c7357611c72611bbb565b5b6000611c8187828801611c0e565b9450506020611c9287828801611c0e565b9350506040611ca387828801611c0e565b9250506060611cb487828801611c44565b91505092959194509250565b60008160070b9050919050565b611cd681611cc0565b82525050565b6000602082019050611cf16000830184611ccd565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b611d4582611cfc565b810181811067ffffffffffffffff82111715611d6457611d63611d0d565b5b80604052505050565b6000611d77611bb1565b9050611d838282611d3c565b919050565b600080fd5b600080fd5b600080fd5b600067ffffffffffffffff821115611db257611db1611d0d565b5b611dbb82611cfc565b9050602081019050919050565b82818337600083830152505050565b6000611dea611de584611d97565b611d6d565b905082815260208101848484011115611e0657611e05611d92565b5b611e11848285611dc8565b509392505050565b600082601f830112611e2e57611e2d611d8d565b5b8135611e3e848260208601611dd7565b91505092915050565b60008115159050919050565b611e5c81611e47565b8114611e6757600080fd5b50565b600081359050611e7981611e53565b92915050565b611e8881611cc0565b8114611e9357600080fd5b50565b600081359050611ea581611e7f565b92915050565b600067ffffffffffffffff821115611ec657611ec5611d0d565b5b602082029050602081019050919050565b600080fd5b600067ffffffffffffffff821115611ef757611ef6611d0d565b5b611f0082611cfc565b9050602081019050919050565b6000611f20611f1b84611edc565b611d6d565b905082815260208101848484011115611f3c57611f3b611d92565b5b611f47848285611dc8565b509392505050565b600082601f830112611f6457611f63611d8d565b5b8135611f74848260208601611f0d565b91505092915050565b600060a08284031215611f9357611f92611cf7565b5b611f9d60a0611d6d565b90506000611fad84828501611e6a565b6000830152506020611fc184828501611c0e565b602083015250604082013567ffffffffffffffff811115611fe557611fe4611d88565b5b611ff184828501611f4f565b604083015250606082013567ffffffffffffffff81111561201557612014611d88565b5b61202184828501611f4f565b606083015250608061203584828501611c0e565b60808301525092915050565b60006040828403121561205757612056611cf7565b5b6120616040611d6d565b9050600061207184828501611c44565b600083015250602082013567ffffffffffffffff81111561209557612094611d88565b5b6120a184828501611f7d565b60208301525092915050565b60006120c06120bb84611eab565b611d6d565b905080838252602082019050602084028301858111156120e3576120e2611ed7565b5b835b8181101561212a57803567ffffffffffffffff81111561210857612107611d8d565b5b8086016121158982612041565b855260208501945050506020810190506120e5565b5050509392505050565b600082601f83011261214957612148611d8d565b5b81356121598482602086016120ad565b91505092915050565b600063ffffffff82169050919050565b61217b81612162565b811461218657600080fd5b50565b60008135905061219881612172565b92915050565b6000606082840312156121b4576121b3611cf7565b5b6121be6060611d6d565b905060006121ce84828501612189565b60008301525060206121e284828501611c0e565b60208301525060406121f684828501612189565b60408301525092915050565b6000610160828403121561221957612218611cf7565b5b612224610120611d6d565b9050600082013567ffffffffffffffff81111561224457612243611d88565b5b61225084828501611e19565b600083015250602082013567ffffffffffffffff81111561227457612273611d88565b5b61228084828501611e19565b602083015250604061229484828501611c0e565b604083015250606082013567ffffffffffffffff8111156122b8576122b7611d88565b5b6122c484828501611e19565b60608301525060806122d884828501611e6a565b60808301525060a06122ec84828501611e96565b60a08301525060c061230084828501611e6a565b60c08301525060e082013567ffffffffffffffff81111561232457612323611d88565b5b61233084828501612134565b60e0830152506101006123458482850161219e565b6101008301525092915050565b6000806040838503121561236957612368611bbb565b5b600061237785828601611c0e565b925050602083013567ffffffffffffffff81111561239857612397611bc0565b5b6123a485828601612202565b9150509250929050565b6000819050919050565b6123c1816123ae565b82525050565b60006020820190506123dc60008301846123b8565b92915050565b600080604083850312156123f9576123f8611bbb565b5b600061240785828601611c0e565b925050602061241885828601612189565b9150509250929050565b61242b81611be5565b82525050565b60006020820190506124466000830184612422565b92915050565b60006020828403121561246257612461611bbb565b5b600061247084828501611c0e565b91505092915050565b60008060006060848603121561249257612491611bbb565b5b60006124a086828701611c0e565b93505060206124b186828701611c0e565b92505060406124c286828701612189565b9150509250925092565b600080608083850312156124e3576124e2611bbb565b5b60006124f185828601611c0e565b92505060206125028582860161219e565b9150509250929050565b60008060006060848603121561252557612524611bbb565b5b600061253386828701611c0e565b935050602061254486828701612189565b925050604061255586828701611c0e565b9150509250925092565b6000806040838503121561257657612575611bbb565b5b600061258485828601611c0e565b925050602061259585828601611c0e565b9150509250929050565b6125a881612162565b82525050565b6125b781611be5565b82525050565b6060820160008201516125d3600085018261259f565b5060208201516125e660208501826125ae565b5060408201516125f9604085018261259f565b50505050565b600060808201905061261460008301856123b8565b61262160208301846125bd565b9392505050565b61263181611e47565b82525050565b600060408201905061264c6000830185611ccd565b6126596020830184612628565b9392505050565b61266981611c23565b82525050565b60006080820190506126846000830187612422565b6126916020830186612422565b61269e6040830185612422565b6126ab6060830184612660565b95945050505050565b600081519050919050565b600081905092915050565b60005b838110156126e85780820151818401526020810190506126cd565b60008484015250505050565b60006126ff826126b4565b61270981856126bf565b93506127198185602086016126ca565b80840191505092915050565b600061273182846126f4565b915081905092915050565b60008160030b9050919050565b6127528161273c565b811461275d57600080fd5b50565b60008151905061276f81612749565b92915050565b60006020828403121561278b5761278a611bbb565b5b600061279984828501612760565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60006127c9826127a2565b6127d381856127ad565b93506127e38185602086016126ca565b6127ec81611cfc565b840191505092915050565b61280081611e47565b82525050565b61280f81611cc0565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61284a81611c23565b82525050565b600082825260208201905092915050565b600061286c826126b4565b6128768185612850565b93506128868185602086016126ca565b61288f81611cfc565b840191505092915050565b600060a0830160008301516128b260008601826127f7565b5060208301516128c560208601826125ae565b50604083015184820360408601526128dd8282612861565b915050606083015184820360608601526128f78282612861565b915050608083015161290c60808601826125ae565b508091505092915050565b600060408301600083015161292f6000860182612841565b5060208301518482036020860152612947828261289a565b9150508091505092915050565b60006129608383612917565b905092915050565b6000602082019050919050565b600061298082612815565b61298a8185612820565b93508360208202850161299c85612831565b8060005b858110156129d857848403895281516129b98582612954565b94506129c483612968565b925060208a019950506001810190506129a0565b50829750879550505050505092915050565b606082016000820151612a00600085018261259f565b506020820151612a1360208501826125ae565b506040820151612a26604085018261259f565b50505050565b6000610160830160008301518482036000860152612a4a82826127be565b91505060208301518482036020860152612a6482826127be565b9150506040830151612a7960408601826125ae565b5060608301518482036060860152612a9182826127be565b9150506080830151612aa660808601826127f7565b5060a0830151612ab960a0860182612806565b5060c0830151612acc60c08601826127f7565b5060e083015184820360e0860152612ae48282612975565b915050610100830151612afb6101008601826129ea565b508091505092915050565b6000604082019050612b1b6000830185612422565b8181036020830152612b2d8184612a2c565b90509392505050565b612b3f81612162565b82525050565b6000604082019050612b5a6000830185612422565b612b676020830184612b36565b9392505050565b600081519050612b7d81611bf7565b92915050565b600060208284031215612b9957612b98611bbb565b5b6000612ba784828501612b6e565b91505092915050565b6000608082019050612bc56000830185612422565b612bd260208301846125bd565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000604082019050612c1d6000830185612422565b612c2a6020830184612422565b9392505050565b600081519050612c4081612172565b92915050565b600060608284031215612c5c57612c5b611cf7565b5b612c666060611d6d565b90506000612c7684828501612c31565b6000830152506020612c8a84828501612b6e565b6020830152506040612c9e84828501612c31565b60408301525092915050565b60008060808385031215612cc157612cc0611bbb565b5b6000612ccf85828601612760565b9250506020612ce085828601612c46565b9150509250929050565b600081519050612cf981611e53565b92915050565b60008060408385031215612d1657612d15611bbb565b5b6000612d2485828601612760565b9250506020612d3585828601612cea565b9150509250929050565b600067ffffffffffffffff82169050919050565b612d5c81612d3f565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60a082016000820151612da4600085018261259f565b506020820151612db760208501826125ae565b506040820151612dca60408501826127f7565b506060820151612ddd60608501826127f7565b506080820151612df060808501826125ae565b50505050565b6000612e028383612d8e565b60a08301905092915050565b6000602082019050919050565b6000612e2682612d62565b612e308185612d6d565b9350612e3b83612d7e565b8060005b83811015612e6c578151612e538882612df6565b9750612e5e83612e0e565b925050600181019050612e3f565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b60c082016000820151612ebb600085018261259f565b506020820151612ece602085018261259f565b506040820151612ee1604085018261259f565b506060820151612ef4606085018261259f565b506080820151612f0760808501826127f7565b5060a0820151612f1a60a08501826125ae565b50505050565b6000612f2c8383612ea5565b60c08301905092915050565b6000602082019050919050565b6000612f5082612e79565b612f5a8185612e84565b9350612f6583612e95565b8060005b83811015612f96578151612f7d8882612f20565b9750612f8883612f38565b925050600181019050612f69565b5085935050505092915050565b600060a0820190508181036000830152612fbd8188612a2c565b9050612fcc6020830187612d53565b612fd96040830186612b36565b8181036060830152612feb8185612e1b565b90508181036080830152612fff8184612f45565b90509695505050505050565b600061301682611bc5565b9050919050565b6130268161300b565b811461303157600080fd5b50565b6000815190506130438161301d565b92915050565b600080604083850312156130605761305f611bbb565b5b600061306e85828601612760565b925050602061307f85828601613034565b9150509250929050565b600060608201905081810360008301526130a38186612a2c565b90506130b26020830185612d53565b6130bf6040830184612b36565b94935050505056fe608060405234801561001057600080fd5b50612465806100206000396000f3fe60806040526004361061009c5760003560e01c80638f8d7f99116100645780638f8d7f99146101d25780639b23d3d91461020f578063af99c6331461024c578063d614cdb814610289578063d8723ec3146102c7578063f2c31ff4146102f75761009c565b806315dacbea146100a157806318370d34146100de5780633b3bff0f1461011b578063593d6e82146101585780637c41ad2c14610195575b600080fd5b3480156100ad57600080fd5b506100c860048036038101906100c39190611395565b610335565b6040516100d59190611418565b60405180910390f35b3480156100ea57600080fd5b5061010560048036038101906101009190611a8e565b610453565b6040516101129190611b03565b60405180910390f35b34801561012757600080fd5b50610142600480360381019061013d9190611b1e565b61056b565b60405161014f9190611b03565b60405180910390f35b34801561016457600080fd5b5061017f600480360381019061017a9190611b4b565b610680565b60405161018c9190611b03565b60405180910390f35b3480156101a157600080fd5b506101bc60048036038101906101b79190611b1e565b610798565b6040516101c99190611b03565b60405180910390f35b3480156101de57600080fd5b506101f960048036038101906101f49190611b8b565b6108ad565b6040516102069190611418565b60405180910390f35b34801561021b57600080fd5b5061023660048036038101906102319190611395565b6109c5565b6040516102439190611418565b60405180910390f35b34801561025857600080fd5b50610273600480360381019061026e9190611b8b565b610ae3565b6040516102809190611418565b60405180910390f35b34801561029557600080fd5b506102b060048036038101906102ab9190611b1e565b610bfb565b6040516102be929190611c2b565b60405180910390f35b6102e160048036038101906102dc9190611c54565b610d2b565b6040516102ee9190611ca3565b60405180910390f35b34801561030357600080fd5b5061031e60048036038101906103199190611b8b565b610f1a565b60405161032c929190611ccd565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016103729493929190611d05565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103dc9190611dbb565b6000604051808303816000865af19150503d8060008114610419576040519150601f19603f3d011682016040523d82523d6000602084013e61041e565b606091505b50915091508161042f576015610444565b808060200190518101906104439190611e0b565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166318370d3460e01b868660405160240161048c92919061219c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104f69190611dbb565b6000604051808303816000865af19150503d8060008114610533576040519150601f19603f3d011682016040523d82523d6000602084013e610538565b606091505b50915091508161054957601561055e565b8080602001905181019061055d9190611e0b565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b856040516024016105a29190611ca3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161060c9190611dbb565b6000604051808303816000865af19150503d8060008114610649576040519150601f19603f3d011682016040523d82523d6000602084013e61064e565b606091505b50915091508161065f576015610674565b808060200190518101906106739190611e0b565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663593d6e8260e01b86866040516024016106b99291906121cc565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107239190611dbb565b6000604051808303816000865af19150503d8060008114610760576040519150601f19603f3d011682016040523d82523d6000602084013e610765565b606091505b50915091508161077657601561078b565b8080602001905181019061078a9190611e0b565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016107cf9190611ca3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108399190611dbb565b6000604051808303816000865af19150503d8060008114610876576040519150601f19603f3d011682016040523d82523d6000602084013e61087b565b606091505b50915091508161088c5760156108a1565b808060200190518101906108a09190611e0b565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b86866040516024016108e69291906121f5565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109509190611dbb565b6000604051808303816000865af19150503d806000811461098d576040519150601f19603f3d011682016040523d82523d6000602084013e610992565b606091505b5091509150816109a35760156109b8565b808060200190518101906109b79190611e0b565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b88888888604051602401610a029493929190611d05565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a6c9190611dbb565b6000604051808303816000865af19150503d8060008114610aa9576040519150601f19603f3d011682016040523d82523d6000602084013e610aae565b606091505b509150915081610abf576015610ad4565b80806020019051810190610ad39190611e0b565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b8686604051602401610b1c9291906121f5565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b869190611dbb565b6000604051808303816000865af19150503d8060008114610bc3576040519150601f19603f3d011682016040523d82523d6000602084013e610bc8565b606091505b509150915081610bd9576015610bee565b80806020019051810190610bed9190611e0b565b5b60030b9250505092915050565b6000610c056111be565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663d614cdb860e01b86604051602401610c3a9190611ca3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610ca49190611dbb565b6000604051808303816000865af19150503d8060008114610ce1576040519150601f19603f3d011682016040523d82523d6000602084013e610ce6565b606091505b5091509150610cf36111be565b82610d0057601581610d15565b81806020019051810190610d1491906122ac565b5b8160030b91508095508196505050505050915091565b6000610d35611201565b60008067ffffffffffffffff811115610d5157610d50611449565b5b604051908082528060200260200182016040528015610d8a57816020015b610d77611270565b815260200190600190039081610d6f5790505b509050610d956111be565b85816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505084816040019063ffffffff16908163ffffffff16815250506040518060400160405280600481526020017f4e414d450000000000000000000000000000000000000000000000000000000081525083600001819052506040518060400160405280600681526020017f53594d424f4c0000000000000000000000000000000000000000000000000000815250836020018190525030836040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050818360e00181905250808361010001819052506040518060400160405280600481526020017f4d454d4f000000000000000000000000000000000000000000000000000000008152508360600181905250600080610efb85612710600161103f565b9150915060168214610f0c57600080fd5b809550505050505092915050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663f2c31ff460e01b8787604051602401610f549291906121f5565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610fbe9190611dbb565b6000604051808303816000865af19150503d8060008114610ffb576040519150601f19603f3d011682016040523d82523d6000602084013e611000565b606091505b5091509150816110135760156000611028565b808060200190518101906110279190612301565b5b8160030b9150809450819550505050509250929050565b6000808460008161010001516000015163ffffffff16148015611071575060008161010001516040015163ffffffff16145b15611097576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463c23baeb660e01b8a8a8a6040516024016110d193929190612373565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161113b9190611dbb565b60006040518083038185875af1925050503d8060008114611178576040519150601f19603f3d011682016040523d82523d6000602084013e61117d565b606091505b50915091508161119057601560006111a5565b808060200190518101906111a491906123ef565b5b8160030b91508095508196505050505050935093915050565b6040518060600160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600063ffffffff1681525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b81526020016000151581526020016060815260200161126a6111be565b81525090565b60405180604001604052806000815260200161128a611290565b81525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061132c82611301565b9050919050565b61133c81611321565b811461134757600080fd5b50565b60008135905061135981611333565b92915050565b6000819050919050565b6113728161135f565b811461137d57600080fd5b50565b60008135905061138f81611369565b92915050565b600080600080608085870312156113af576113ae6112f7565b5b60006113bd8782880161134a565b94505060206113ce8782880161134a565b93505060406113df8782880161134a565b92505060606113f087828801611380565b91505092959194509250565b60008160070b9050919050565b611412816113fc565b82525050565b600060208201905061142d6000830184611409565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61148182611438565b810181811067ffffffffffffffff821117156114a05761149f611449565b5b80604052505050565b60006114b36112ed565b90506114bf8282611478565b919050565b600080fd5b600080fd5b600080fd5b600067ffffffffffffffff8211156114ee576114ed611449565b5b6114f782611438565b9050602081019050919050565b82818337600083830152505050565b6000611526611521846114d3565b6114a9565b905082815260208101848484011115611542576115416114ce565b5b61154d848285611504565b509392505050565b600082601f83011261156a576115696114c9565b5b813561157a848260208601611513565b91505092915050565b60008115159050919050565b61159881611583565b81146115a357600080fd5b50565b6000813590506115b58161158f565b92915050565b6115c4816113fc565b81146115cf57600080fd5b50565b6000813590506115e1816115bb565b92915050565b600067ffffffffffffffff82111561160257611601611449565b5b602082029050602081019050919050565b600080fd5b600067ffffffffffffffff82111561163357611632611449565b5b61163c82611438565b9050602081019050919050565b600061165c61165784611618565b6114a9565b905082815260208101848484011115611678576116776114ce565b5b611683848285611504565b509392505050565b600082601f8301126116a05761169f6114c9565b5b81356116b0848260208601611649565b91505092915050565b600060a082840312156116cf576116ce611433565b5b6116d960a06114a9565b905060006116e9848285016115a6565b60008301525060206116fd8482850161134a565b602083015250604082013567ffffffffffffffff811115611721576117206114c4565b5b61172d8482850161168b565b604083015250606082013567ffffffffffffffff811115611751576117506114c4565b5b61175d8482850161168b565b60608301525060806117718482850161134a565b60808301525092915050565b60006040828403121561179357611792611433565b5b61179d60406114a9565b905060006117ad84828501611380565b600083015250602082013567ffffffffffffffff8111156117d1576117d06114c4565b5b6117dd848285016116b9565b60208301525092915050565b60006117fc6117f7846115e7565b6114a9565b9050808382526020820190506020840283018581111561181f5761181e611613565b5b835b8181101561186657803567ffffffffffffffff811115611844576118436114c9565b5b808601611851898261177d565b85526020850194505050602081019050611821565b5050509392505050565b600082601f830112611885576118846114c9565b5b81356118958482602086016117e9565b91505092915050565b600063ffffffff82169050919050565b6118b78161189e565b81146118c257600080fd5b50565b6000813590506118d4816118ae565b92915050565b6000606082840312156118f0576118ef611433565b5b6118fa60606114a9565b9050600061190a848285016118c5565b600083015250602061191e8482850161134a565b6020830152506040611932848285016118c5565b60408301525092915050565b6000610160828403121561195557611954611433565b5b6119606101206114a9565b9050600082013567ffffffffffffffff8111156119805761197f6114c4565b5b61198c84828501611555565b600083015250602082013567ffffffffffffffff8111156119b0576119af6114c4565b5b6119bc84828501611555565b60208301525060406119d08482850161134a565b604083015250606082013567ffffffffffffffff8111156119f4576119f36114c4565b5b611a0084828501611555565b6060830152506080611a14848285016115a6565b60808301525060a0611a28848285016115d2565b60a08301525060c0611a3c848285016115a6565b60c08301525060e082013567ffffffffffffffff811115611a6057611a5f6114c4565b5b611a6c84828501611870565b60e083015250610100611a81848285016118da565b6101008301525092915050565b60008060408385031215611aa557611aa46112f7565b5b6000611ab38582860161134a565b925050602083013567ffffffffffffffff811115611ad457611ad36112fc565b5b611ae08582860161193e565b9150509250929050565b6000819050919050565b611afd81611aea565b82525050565b6000602082019050611b186000830184611af4565b92915050565b600060208284031215611b3457611b336112f7565b5b6000611b428482850161134a565b91505092915050565b60008060808385031215611b6257611b616112f7565b5b6000611b708582860161134a565b9250506020611b81858286016118da565b9150509250929050565b60008060408385031215611ba257611ba16112f7565b5b6000611bb08582860161134a565b9250506020611bc18582860161134a565b9150509250929050565b611bd48161189e565b82525050565b611be381611321565b82525050565b606082016000820151611bff6000850182611bcb565b506020820151611c126020850182611bda565b506040820151611c256040850182611bcb565b50505050565b6000608082019050611c406000830185611af4565b611c4d6020830184611be9565b9392505050565b60008060408385031215611c6b57611c6a6112f7565b5b6000611c798582860161134a565b9250506020611c8a858286016118c5565b9150509250929050565b611c9d81611321565b82525050565b6000602082019050611cb86000830184611c94565b92915050565b611cc781611583565b82525050565b6000604082019050611ce26000830185611409565b611cef6020830184611cbe565b9392505050565b611cff8161135f565b82525050565b6000608082019050611d1a6000830187611c94565b611d276020830186611c94565b611d346040830185611c94565b611d416060830184611cf6565b95945050505050565b600081519050919050565b600081905092915050565b60005b83811015611d7e578082015181840152602081019050611d63565b60008484015250505050565b6000611d9582611d4a565b611d9f8185611d55565b9350611daf818560208601611d60565b80840191505092915050565b6000611dc78284611d8a565b915081905092915050565b60008160030b9050919050565b611de881611dd2565b8114611df357600080fd5b50565b600081519050611e0581611ddf565b92915050565b600060208284031215611e2157611e206112f7565b5b6000611e2f84828501611df6565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000611e5f82611e38565b611e698185611e43565b9350611e79818560208601611d60565b611e8281611438565b840191505092915050565b611e9681611583565b82525050565b611ea5816113fc565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b611ee08161135f565b82525050565b600082825260208201905092915050565b6000611f0282611d4a565b611f0c8185611ee6565b9350611f1c818560208601611d60565b611f2581611438565b840191505092915050565b600060a083016000830151611f486000860182611e8d565b506020830151611f5b6020860182611bda565b5060408301518482036040860152611f738282611ef7565b91505060608301518482036060860152611f8d8282611ef7565b9150506080830151611fa26080860182611bda565b508091505092915050565b6000604083016000830151611fc56000860182611ed7565b5060208301518482036020860152611fdd8282611f30565b9150508091505092915050565b6000611ff68383611fad565b905092915050565b6000602082019050919050565b600061201682611eab565b6120208185611eb6565b93508360208202850161203285611ec7565b8060005b8581101561206e578484038952815161204f8582611fea565b945061205a83611ffe565b925060208a01995050600181019050612036565b50829750879550505050505092915050565b6060820160008201516120966000850182611bcb565b5060208201516120a96020850182611bda565b5060408201516120bc6040850182611bcb565b50505050565b60006101608301600083015184820360008601526120e08282611e54565b915050602083015184820360208601526120fa8282611e54565b915050604083015161210f6040860182611bda565b50606083015184820360608601526121278282611e54565b915050608083015161213c6080860182611e8d565b5060a083015161214f60a0860182611e9c565b5060c083015161216260c0860182611e8d565b5060e083015184820360e086015261217a828261200b565b915050610100830151612191610100860182612080565b508091505092915050565b60006040820190506121b16000830185611c94565b81810360208301526121c381846120c2565b90509392505050565b60006080820190506121e16000830185611c94565b6121ee6020830184611be9565b9392505050565b600060408201905061220a6000830185611c94565b6122176020830184611c94565b9392505050565b60008151905061222d816118ae565b92915050565b60008151905061224281611333565b92915050565b60006060828403121561225e5761225d611433565b5b61226860606114a9565b905060006122788482850161221e565b600083015250602061228c84828501612233565b60208301525060406122a08482850161221e565b60408301525092915050565b600080608083850312156122c3576122c26112f7565b5b60006122d185828601611df6565b92505060206122e285828601612248565b9150509250929050565b6000815190506122fb8161158f565b92915050565b60008060408385031215612318576123176112f7565b5b600061232685828601611df6565b9250506020612337858286016122ec565b9150509250929050565b600067ffffffffffffffff82169050919050565b61235e81612341565b82525050565b61236d8161189e565b82525050565b6000606082019050818103600083015261238d81866120c2565b905061239c6020830185612355565b6123a96040830184612364565b949350505050565b60006123bc82611301565b9050919050565b6123cc816123b1565b81146123d757600080fd5b50565b6000815190506123e9816123c3565b92915050565b60008060408385031215612406576124056112f7565b5b600061241485828601611df6565b9250506020612425858286016123da565b915050925092905056fea2646970667358221220128389c466ad2c67b3afe898d0e255706c9a9c64a455daa3ffbee65c4eadfe3064736f6c63430008100033a26469706673582212204f89cfbd62727c6ec2b25be68e193a182573953157fb3b140254b53346f9fe1b64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.json
deleted file mode 100644
index 740322ca2097..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getTokenExpiryInfo","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiryInfo","type":"tuple"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"grantTokenKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"isKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"},{"internalType":"bool","name":"kycGranted","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"name":"makeRenewableToken","outputs":[{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"name":"makeRenewableTokenIndirectly","outputs":[{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"},{"internalType":"address","name":"feeCollector","type":"address"}],"name":"makeRenewableTokenWithFractionalFee","outputs":[{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"},{"internalType":"address","name":"feeCollector","type":"address"}],"name":"makeRenewableTokenWithSelfDenominatedFixedFee","outputs":[{"internalType":"address","name":"tokenAddress","type":"address"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"pauseToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"revokeTokenKyc","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"serialNumber","type":"uint256"}],"name":"transferFromNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"unpauseToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiryInfo","type":"tuple"}],"name":"updateTokenExpiryInfo","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"symbol","type":"string"},{"internalType":"address","name":"treasury","type":"address"},{"internalType":"string","name":"memo","type":"string"},{"internalType":"bool","name":"tokenSupplyType","type":"bool"},{"internalType":"int64","name":"maxSupply","type":"int64"},{"internalType":"bool","name":"freezeDefault","type":"bool"},{"components":[{"internalType":"uint256","name":"keyType","type":"uint256"},{"components":[{"internalType":"bool","name":"inheritAccountKey","type":"bool"},{"internalType":"address","name":"contractId","type":"address"},{"internalType":"bytes","name":"ed25519","type":"bytes"},{"internalType":"bytes","name":"ECDSA_secp256k1","type":"bytes"},{"internalType":"address","name":"delegatableContractId","type":"address"}],"internalType":"struct IHederaTokenService.KeyValue","name":"key","type":"tuple"}],"internalType":"struct IHederaTokenService.TokenKey[]","name":"tokenKeys","type":"tuple[]"},{"components":[{"internalType":"uint32","name":"second","type":"uint32"},{"internalType":"address","name":"autoRenewAccount","type":"address"},{"internalType":"uint32","name":"autoRenewPeriod","type":"uint32"}],"internalType":"struct IHederaTokenService.Expiry","name":"expiry","type":"tuple"}],"internalType":"struct IHederaTokenService.HederaToken","name":"tokenInfo","type":"tuple"}],"name":"updateTokenInfo","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"tokenAddress","type":"address"},{"internalType":"address","name":"newAutoRenewAccount","type":"address"},{"internalType":"uint32","name":"newAutoRenewPeriod","type":"uint32"}],"name":"updateTokenWithNewAutoRenewInfo","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"tokenAddress","type":"address"},{"internalType":"address","name":"newTreasury","type":"address"}],"name":"updateTokenWithNewTreasury","outputs":[],"stateMutability":"payable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.bin
deleted file mode 100644
index f10f7235c1cc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50604051610c25380380610c2583398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b610b92806100936000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806381f71ab61161005b57806381f71ab6146100cf578063aad91110146100e2578063ef7c7fb0146100f5578063f418b4691461010857600080fd5b80631191dbdc1461008257806312199f42146100975780637c41ad2c146100aa575b600080fd5b610095610090366004610820565b61011b565b005b6100956100a536600461088b565b61013b565b6100bd6100b83660046108d2565b610209565b60405190815260200160405180910390f35b6100956100dd3660046108f4565b6102ed565b6100956100f0366004610820565b61035c565b610095610103366004610958565b610402565b610095610116366004610958565b61041d565b60008054610135916001600160a01b0390911690836104b5565b50505050565b600054610153906001600160a01b03168484846105cb565b5060008054819081906101a5906001600160a01b031682805b60405190808252806020026020018201604052801561019f57816020015b606081526020019060019003908161018a5790505b506104b5565b91945092509050601683146102015760405162461bcd60e51b815260206004820152601e60248201527f4d696e74206f662066756e6769626c6520746f6b656e206661696c656421000060448201526064015b60405180910390fd5b505050505050565b604080516001600160a01b03831660248083019190915282518083039091018152604490910182526020810180516001600160e01b03167f7c41ad2c000000000000000000000000000000000000000000000000000000001790529051600091829182916101679161027b91906109a1565b6000604051808303816000865af19150503d80600081146102b8576040519150601f19603f3d011682016040523d82523d6000602084013e6102bd565b606091505b5091509150816102ce5760156102e2565b808060200190518101906102e291906109cf565b60030b949350505050565b60008060006102fe856000866104b5565b91945092509050601683146103555760405162461bcd60e51b815260206004820152601960248201527f4e6f6e2066756e6769626c65206d696e74206661696c6564210000000000000060448201526064016101f8565b5050505050565b6000805481908190610378906001600160a01b031682866104b5565b92509250925080600081518110610391576103916109ea565b602002602001015160070b8267ffffffffffffffff1660405160405180910390a2601683146101355760405162461bcd60e51b815260206004820152601960248201527f4e6f6e2066756e6769626c65206d696e74206661696c6564210000000000000060448201526064016101f8565b60008054610135916001600160a01b0390911690839061016c565b6000805481908190610439906001600160a01b0316858361016c565b92509250925060008267ffffffffffffffff1660405160405180910390a2601683141580610468575060008151115b156101355760405162461bcd60e51b815260206004820152601560248201527f46756e6769626c65206d696e74206661696c656421000000000000000000000060448201526064016101f8565b60008060606000806101676001600160a01b031663278e0b8860e01b8989896040516024016104e693929190610a00565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff0000000000000000000000000000000000000000000000000000000090941693909317909252905161053c91906109a1565b6000604051808303816000865af19150503d8060008114610579576040519150601f19603f3d011682016040523d82523d6000602084013e61057e565b606091505b5091509150816105a15760408051600080825260208201909252601591906105b5565b808060200190518101906105b59190610a9c565b60039290920b9a90995090975095505050505050565b604080516001600160a01b038681166024830152858116604483015284166064820152600783900b6084808301919091528251808303909101815260a490910182526020810180516001600160e01b03167feca36917000000000000000000000000000000000000000000000000000000001790529051600091829182916101679161065791906109a1565b6000604051808303816000865af19150503d8060008114610694576040519150601f19603f3d011682016040523d82523d6000602084013e610699565b606091505b5091509150816106aa5760156106be565b808060200190518101906106be91906109cf565b60030b979650505050505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561070b5761070b6106cc565b604052919050565b600067ffffffffffffffff82111561072d5761072d6106cc565b5060051b60200190565b6000601f838184011261074957600080fd5b8235602061075e61075983610713565b6106e2565b82815260059290921b8501810191818101908784111561077d57600080fd5b8287015b8481101561081457803567ffffffffffffffff808211156107a25760008081fd5b818a0191508a603f8301126107b75760008081fd5b858201356040828211156107cd576107cd6106cc565b6107de828b01601f191689016106e2565b92508183528c818386010111156107f55760008081fd5b8181850189850137506000908201870152845250918301918301610781565b50979650505050505050565b60006020828403121561083257600080fd5b813567ffffffffffffffff81111561084957600080fd5b61085584828501610737565b949350505050565b80356001600160a01b038116811461087457600080fd5b919050565b8060070b811461088857600080fd5b50565b6000806000606084860312156108a057600080fd5b6108a98461085d565b92506108b76020850161085d565b915060408401356108c781610879565b809150509250925092565b6000602082840312156108e457600080fd5b6108ed8261085d565b9392505050565b6000806040838503121561090757600080fd5b6109108361085d565b9150602083013567ffffffffffffffff81111561092c57600080fd5b61093885828601610737565b9150509250929050565b67ffffffffffffffff8116811461088857600080fd5b60006020828403121561096a57600080fd5b81356108ed81610942565b60005b83811015610990578181015183820152602001610978565b838111156101355750506000910152565b600082516109b3818460208701610975565b9190910192915050565b8051600381900b811461087457600080fd5b6000602082840312156109e157600080fd5b6108ed826109bd565b634e487b7160e01b600052603260045260246000fd5b6000606082016001600160a01b0386168352602067ffffffffffffffff8616818501526060604085015281855180845260808601915060808160051b870101935082870160005b82811015610a8d57878603607f1901845281518051808852610a6e81888a01898501610975565b601f01601f191696909601850195509284019290840190600101610a47565b50939998505050505050505050565b600080600060608486031215610ab157600080fd5b610aba846109bd565b9250602080850151610acb81610942565b604086015190935067ffffffffffffffff811115610ae857600080fd5b8501601f81018713610af957600080fd5b8051610b0761075982610713565b81815260059190911b82018301908381019089831115610b2657600080fd5b928401925b82841015610b4d578351610b3e81610879565b82529284019290840190610b2b565b8095505050505050925092509256fea2646970667358221220539021dabefb3ad6b4b014421b748d2f5430fab6b0b0f31c72a38f86f0eabb5d64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.json
deleted file mode 100644
index ea7d47ab8b44..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.json
+++ /dev/null
@@ -1,144 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": true,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "totalSupply",
-          "type": "uint64"
-        },
-        {
-          "indexed": true,
-          "internalType": "int256",
-          "name": "firstSerialNumber",
-          "type": "int256"
-        }
-      ],
-      "name": "MintedTokenInfo",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "amount",
-          "type": "uint64"
-        }
-      ],
-      "name": "mintFungibleToken",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "amount",
-          "type": "uint64"
-        }
-      ],
-      "name": "mintFungibleTokenWithEvent",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes[]",
-          "name": "metadata",
-          "type": "bytes[]"
-        }
-      ],
-      "name": "mintNonFungibleToken",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_tokenAddress",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes[]",
-          "name": "metadata",
-          "type": "bytes[]"
-        }
-      ],
-      "name": "mintNonFungibleTokenWithAddress",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes[]",
-          "name": "metadata",
-          "type": "bytes[]"
-        }
-      ],
-      "name": "mintNonFungibleTokenWithEvent",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "pauseToken",
-      "outputs": [
-        {
-          "internalType": "int256",
-          "name": "responseCode",
-          "type": "int256"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "sender",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "recipient",
-          "type": "address"
-        },
-        {
-          "internalType": "int64",
-          "name": "amount",
-          "type": "int64"
-        }
-      ],
-      "name": "revertMintAfterFailedMint",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.bin
deleted file mode 100644
index 1c1a68e919bd..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610ba2806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637c41ad2c1461003b57806381f71ab61461006b575b600080fd5b610055600480360381019061005091906103ea565b610087565b6040516100629190610430565b60405180910390f35b61008560048036038101906100809190610677565b61019c565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100be91906106e2565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610128919061076e565b6000604051808303816000865af19150503d8060008114610165576040519150601f19603f3d011682016040523d82523d6000602084013e61016a565b606091505b50915091508161017b576015610190565b8080602001905181019061018f91906107be565b5b60030b92505050919050565b60008060006101ad85600086610200565b925092509250601660030b83146101f9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f090610848565b60405180910390fd5b5050505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161023e93929190610997565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102a8919061076e565b6000604051808303816000865af19150503d80600081146102e5576040519150601f19603f3d011682016040523d82523d6000602084013e6102ea565b606091505b50915091508161034657601560008067ffffffffffffffff81111561031257610311610461565b5b6040519080825280602002602001820160405280156103405781602001602082028036833780820191505090505b5061035b565b8080602001905181019061035a9190610afd565b5b8260030b9250809550819650829750505050505093509350939050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103b78261038c565b9050919050565b6103c7816103ac565b81146103d257600080fd5b50565b6000813590506103e4816103be565b92915050565b600060208284031215610400576103ff610382565b5b600061040e848285016103d5565b91505092915050565b6000819050919050565b61042a81610417565b82525050565b60006020820190506104456000830184610421565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61049982610450565b810181811067ffffffffffffffff821117156104b8576104b7610461565b5b80604052505050565b60006104cb610378565b90506104d78282610490565b919050565b600067ffffffffffffffff8211156104f7576104f6610461565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff82111561052d5761052c610461565b5b61053682610450565b9050602081019050919050565b82818337600083830152505050565b600061056561056084610512565b6104c1565b9050828152602081018484840111156105815761058061050d565b5b61058c848285610543565b509392505050565b600082601f8301126105a9576105a861044b565b5b81356105b9848260208601610552565b91505092915050565b60006105d56105d0846104dc565b6104c1565b905080838252602082019050602084028301858111156105f8576105f7610508565b5b835b8181101561063f57803567ffffffffffffffff81111561061d5761061c61044b565b5b80860161062a8982610594565b855260208501945050506020810190506105fa565b5050509392505050565b600082601f83011261065e5761065d61044b565b5b813561066e8482602086016105c2565b91505092915050565b6000806040838503121561068e5761068d610382565b5b600061069c858286016103d5565b925050602083013567ffffffffffffffff8111156106bd576106bc610387565b5b6106c985828601610649565b9150509250929050565b6106dc816103ac565b82525050565b60006020820190506106f760008301846106d3565b92915050565b600081519050919050565b600081905092915050565b60005b83811015610731578082015181840152602081019050610716565b60008484015250505050565b6000610748826106fd565b6107528185610708565b9350610762818560208601610713565b80840191505092915050565b600061077a828461073d565b915081905092915050565b60008160030b9050919050565b61079b81610785565b81146107a657600080fd5b50565b6000815190506107b881610792565b92915050565b6000602082840312156107d4576107d3610382565b5b60006107e2848285016107a9565b91505092915050565b600082825260208201905092915050565b7f4e6f6e2046756e6769626c65206d696e74206661696c65642100000000000000600082015250565b60006108326019836107eb565b915061083d826107fc565b602082019050919050565b6000602082019050818103600083015261086181610825565b9050919050565b600067ffffffffffffffff82169050919050565b61088581610868565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b60006108d3826106fd565b6108dd81856108b7565b93506108ed818560208601610713565b6108f681610450565b840191505092915050565b600061090d83836108c8565b905092915050565b6000602082019050919050565b600061092d8261088b565b6109378185610896565b935083602082028501610949856108a7565b8060005b8581101561098557848403895281516109668582610901565b945061097183610915565b925060208a0199505060018101905061094d565b50829750879550505050505092915050565b60006060820190506109ac60008301866106d3565b6109b9602083018561087c565b81810360408301526109cb8184610922565b9050949350505050565b6109de81610868565b81146109e957600080fd5b50565b6000815190506109fb816109d5565b92915050565b600067ffffffffffffffff821115610a1c57610a1b610461565b5b602082029050602081019050919050565b60008160070b9050919050565b610a4381610a2d565b8114610a4e57600080fd5b50565b600081519050610a6081610a3a565b92915050565b6000610a79610a7484610a01565b6104c1565b90508083825260208201905060208402830185811115610a9c57610a9b610508565b5b835b81811015610ac55780610ab18882610a51565b845260208401935050602081019050610a9e565b5050509392505050565b600082601f830112610ae457610ae361044b565b5b8151610af4848260208601610a66565b91505092915050565b600080600060608486031215610b1657610b15610382565b5b6000610b24868287016107a9565b9350506020610b35868287016109ec565b925050604084015167ffffffffffffffff811115610b5657610b55610387565b5b610b6286828701610acf565b915050925092509256fea2646970667358221220fc704716c248828a55d1c40d5b4f40b19abc0a6ff3e7d05aa9a8525a0f8c695864736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.json
deleted file mode 100644
index 121fd46de2e1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintNonFungibleTokenWithAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.bin
deleted file mode 100644
index 62f1a192a4f2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610a52806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637c41ad2c1461003b578063e7b5866d1461006b575b600080fd5b61005560048036038101906100509190610437565b610087565b604051610062919061047d565b60405180910390f35b610085600480360381019061008091906104d8565b61019c565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100be9190610527565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161012891906105b3565b6000604051808303816000865af19150503d8060008114610165576040519150601f19603f3d011682016040523d82523d6000602084013e61016a565b606091505b50915091508161017b576015610190565b8080602001905181019061018f9190610603565b5b60030b92505050919050565b60008060006101fa8486600067ffffffffffffffff8111156101c1576101c0610630565b5b6040519080825280602002602001820160405280156101f457816020015b60608152602001906001900390816101df5790505b5061024d565b925092509250601660030b8314610246576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161023d906106bc565b60405180910390fd5b5050505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161028b93929190610808565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102f591906105b3565b6000604051808303816000865af19150503d8060008114610332576040519150601f19603f3d011682016040523d82523d6000602084013e610337565b606091505b50915091508161039357601560008067ffffffffffffffff81111561035f5761035e610630565b5b60405190808252806020026020018201604052801561038d5781602001602082028036833780820191505090505b506103a8565b808060200190518101906103a791906109ad565b5b8260030b9250809550819650829750505050505093509350939050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610404826103d9565b9050919050565b610414816103f9565b811461041f57600080fd5b50565b6000813590506104318161040b565b92915050565b60006020828403121561044d5761044c6103cf565b5b600061045b84828501610422565b91505092915050565b6000819050919050565b61047781610464565b82525050565b6000602082019050610492600083018461046e565b92915050565b600067ffffffffffffffff82169050919050565b6104b581610498565b81146104c057600080fd5b50565b6000813590506104d2816104ac565b92915050565b600080604083850312156104ef576104ee6103cf565b5b60006104fd858286016104c3565b925050602061050e85828601610422565b9150509250929050565b610521816103f9565b82525050565b600060208201905061053c6000830184610518565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561057657808201518184015260208101905061055b565b60008484015250505050565b600061058d82610542565b610597818561054d565b93506105a7818560208601610558565b80840191505092915050565b60006105bf8284610582565b915081905092915050565b60008160030b9050919050565b6105e0816105ca565b81146105eb57600080fd5b50565b6000815190506105fd816105d7565b92915050565b600060208284031215610619576106186103cf565b5b6000610627848285016105ee565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600082825260208201905092915050565b7f546f6b656e206d696e74206661696c6564000000000000000000000000000000600082015250565b60006106a660118361065f565b91506106b182610670565b602082019050919050565b600060208201905081810360008301526106d581610699565b9050919050565b6106e581610498565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b6000601f19601f8301169050919050565b600061074482610542565b61074e8185610717565b935061075e818560208601610558565b61076781610728565b840191505092915050565b600061077e8383610739565b905092915050565b6000602082019050919050565b600061079e826106eb565b6107a881856106f6565b9350836020820285016107ba85610707565b8060005b858110156107f657848403895281516107d78582610772565b94506107e283610786565b925060208a019950506001810190506107be565b50829750879550505050505092915050565b600060608201905061081d6000830186610518565b61082a60208301856106dc565b818103604083015261083c8184610793565b9050949350505050565b600081519050610855816104ac565b92915050565b600080fd5b61086982610728565b810181811067ffffffffffffffff8211171561088857610887610630565b5b80604052505050565b600061089b6103c5565b90506108a78282610860565b919050565b600067ffffffffffffffff8211156108c7576108c6610630565b5b602082029050602081019050919050565b600080fd5b60008160070b9050919050565b6108f3816108dd565b81146108fe57600080fd5b50565b600081519050610910816108ea565b92915050565b6000610929610924846108ac565b610891565b9050808382526020820190506020840283018581111561094c5761094b6108d8565b5b835b8181101561097557806109618882610901565b84526020840193505060208101905061094e565b5050509392505050565b600082601f8301126109945761099361085b565b5b81516109a4848260208601610916565b91505092915050565b6000806000606084860312156109c6576109c56103cf565b5b60006109d4868287016105ee565b93505060206109e586828701610846565b925050604084015167ffffffffffffffff811115610a0657610a056103d4565b5b610a128682870161097f565b915050925092509256fea2646970667358221220edf643e2dabbfc27a0e76d80c03cd18c8f9c962a10a6c1c9d3843005e8cdc1c464736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.json
deleted file mode 100644
index 49829e410c4b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "mintToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.bin
deleted file mode 100644
index eda1e2e94d53..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060405160408062001ef783398101806040526200003391908101906200016f565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f21f4b4d1cb9d37227fd04f9ddaab410ce2cbfd710614fa6e7cca5f8b7dc9e7e4336000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051620000c7929190620001c1565b60405180910390a181600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050506200022e565b60006200016782516200020e565b905092915050565b600080604083850312156200018357600080fd5b6000620001938582860162000159565b9250506020620001a68582860162000159565b9150509250929050565b620001bb81620001ee565b82525050565b6000604082019050620001d86000830185620001b0565b620001e76020830184620001b0565b9392505050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b611cb9806200023e6000396000f3006080604052600436106100ba576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806329092d0e146100bf578063450efe21146100e85780634eb832021461012557806378710d3714610162578063811191301461018d5780638b1b925f146101b85780638da5cb5b146101f5578063da71addf14610220578063ed9c331014610249578063f2fde38b14610286578063f46eccc4146102af578063ffdece15146102ee575b600080fd5b3480156100cb57600080fd5b506100e660048036036100e1919081019061159e565b610317565b005b3480156100f457600080fd5b5061010f600480360361010a919081019061159e565b610566565b60405161011c91906119b4565b60405180910390f35b34801561013157600080fd5b5061014c6004803603610147919081019061162e565b6105fd565b6040516101599190611ab0565b60405180910390f35b34801561016e57600080fd5b5061017761062d565b6040516101849190611ab0565b60405180910390f35b34801561019957600080fd5b506101a2610636565b6040516101af9190611992565b60405180910390f35b3480156101c457600080fd5b506101df60048036036101da919081019061159e565b6106e6565b6040516101ec91906119d6565b60405180910390f35b34801561020157600080fd5b5061020a610795565b60405161021791906118ed565b60405180910390f35b34801561022c57600080fd5b506102476004803603610242919081019061159e565b6107ba565b005b34801561025557600080fd5b50610270600480360361026b919081019061159e565b6107fe565b60405161027d91906119f1565b60405180910390f35b34801561029257600080fd5b506102ad60048036036102a8919081019061159e565b61084a565b005b3480156102bb57600080fd5b506102d660048036036102d1919081019061159e565b61099f565b6040516102e593929190611954565b60405180910390f35b3480156102fa57600080fd5b50610315600480360361031091908101906115c7565b610a81565b005b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561037657600080fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018054600181600116156101000203166002900480601f01602080910402602001604051908101604052809291908181526020018280546001816001161561010002031660029004801561044c5780601f106104215761010080835404028352916020019161044c565b820191906000526020600020905b81548152906001019060200180831161042f57829003601f168201915b50505050509150600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206002015490506104a3600184610d2b565b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560018201600061051a919061130b565b600282016000905550507f6b5e061c2723977f937b93b432ea58c4acda08492aa00fd4e57b1bdb3befd54f838383426040516105599493929190611908565b60405180910390a1505050565b6060600760008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054806020026020016040519081016040528092919081815260200182805480156105f157602002820191906000526020600020905b8154815260200190600101908083116105dd575b50505050509050919050565b60076020528160005260406000208181548110151561061857fe5b90600052602060002001600091509150505481565b60006007905090565b606073__AddressBook.sol:AddressBook___________632f5ea13160016040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040161068c9190611a6c565b60006040518083038186803b1580156106a457600080fd5b505af41580156106b8573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052506106e1919081019061166a565b905090565b600073__AddressBook.sol:AddressBook___________634b71ac576001846040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040161073e929190611a87565b60206040518083038186803b15801561075657600080fd5b505af415801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061078e91908101906116ab565b9050919050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b80600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000600660008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600201549050919050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156108a557600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141515156108e157600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60066020528060005260406000206000915090508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690806001018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610a715780601f10610a4657610100808354040283529160200191610a71565b820191906000526020600020905b815481529060010190602001808311610a5457829003601f168201915b5050505050908060020154905083565b610a89611353565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610ae457600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636a938567836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401610b5b91906119f1565b602060405180830381600087803b158015610b7557600080fd5b505af1158015610b89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250610bad91908101906116ab565b1515610bee576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610be590611a0c565b60405180910390fd5b610bf960018561114e565b6060604051908101604052808573ffffffffffffffffffffffffffffffffffffffff1681526020018481526020018360001916815250905080600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506020820151816001019080519060200190610cd492919061138e565b50604082015181600201906000191690559050507feac8e63742511513b4d3c1a676f580bbe1d9058aaa7b0b277c57e220398a2dbf84848442604051610d1d9493929190611908565b60405180910390a150505050565b60008260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515610dbd576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610db490611a2c565b60405180910390fd5b8260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050610e1c600184600201805490506112f290919063ffffffff16565b811415610ef457610e3e600184600201805490506112f290919063ffffffff16565b8360020181610e4d919061140e565b5060008360000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555060008360010160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550611149565b60008360000160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508260020181815481101515610f5f57fe5b9060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905582600201610fab600185600201805490506112f290919063ffffffff16565b815481101515610fb757fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168360020182815481101515610ff357fe5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508083600101600085600201611061600188600201805490506112f290919063ffffffff16565b81548110151561106d57fe5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506110f1600184600201805490506112f290919063ffffffff16565b8360020181611100919061140e565b5060008360010160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055505b505050565b8160000160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156111df576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111d690611a4c565b60405180910390fd5b60018260000160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555081600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816002018190806001815401808255809150509060018203906000526020600020016000909192909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050565b600082821115151561130057fe5b818303905092915050565b50805460018160011615610100020316600290046000825580601f106113315750611350565b601f01602090049060005260206000209081019061134f919061143a565b5b50565b606060405190810160405280600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600080191681525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106113cf57805160ff19168380011785556113fd565b828001600101855582156113fd579182015b828111156113fc5782518255916020019190600101906113e1565b5b50905061140a919061143a565b5090565b81548183558181111561143557818360005260206000209182019101611434919061143a565b5b505050565b61145c91905b80821115611458576000816000905550600101611440565b5090565b90565b600061146b8235611bec565b905092915050565b600061147f8251611bec565b905092915050565b600082601f830112151561149a57600080fd5b81516114ad6114a882611af8565b611acb565b915081818352602084019350602081019050838560208402820111156114d257600080fd5b60005b8381101561150257816114e88882611473565b8452602084019350602083019250506001810190506114d5565b5050505092915050565b60006115188251611c0c565b905092915050565b600061152c8235611c18565b905092915050565b600082601f830112151561154757600080fd5b813561155a61155582611b20565b611acb565b9150808252602083016020830185838301111561157657600080fd5b611581838284611c2c565b50505092915050565b60006115968235611c22565b905092915050565b6000602082840312156115b057600080fd5b60006115be8482850161145f565b91505092915050565b6000806000606084860312156115dc57600080fd5b60006115ea8682870161145f565b935050602084013567ffffffffffffffff81111561160757600080fd5b61161386828701611534565b925050604061162486828701611520565b9150509250925092565b6000806040838503121561164157600080fd5b600061164f8582860161145f565b92505060206116608582860161158a565b9150509250929050565b60006020828403121561167c57600080fd5b600082015167ffffffffffffffff81111561169657600080fd5b6116a284828501611487565b91505092915050565b6000602082840312156116bd57600080fd5b60006116cb8482850161150c565b91505092915050565b6116dd81611bac565b82525050565b6116ec81611bac565b82525050565b60006116fd82611b66565b80845260208401935061170f83611b4c565b60005b82811015611741576117258683516116d4565b61172e82611b92565b9150602086019550600181019050611712565b50849250505092915050565b600061175882611b71565b80845260208401935061176a83611b59565b60005b8281101561179c576117808683516118de565b61178982611b9f565b915060208601955060018101905061176d565b50849250505092915050565b6117b181611bcc565b82525050565b6117c081611bd8565b82525050565b60006117d182611b87565b8084526117e5816020860160208601611c3b565b6117ee81611c6e565b602085010191505092915050565b600061180782611b7c565b80845261181b816020860160208601611c3b565b61182481611c6e565b602085010191505092915050565b6000601982527f496e76616c6964206a7572697364696374696f6e20636f6465000000000000006020830152604082019050919050565b6000601682527f4164647265737320646f6573206e6f74206578697374000000000000000000006020830152604082019050919050565b6000601682527f4164647265737320616c726561647920657869737473000000000000000000006020830152604082019050919050565b8082525050565b6118e781611be2565b82525050565b600060208201905061190260008301846116d4565b92915050565b600060808201905061191d60008301876116d4565b818103602083015261192f81866117c6565b905061193e60408301856117b7565b61194b60608301846118de565b95945050505050565b600060608201905061196960008301866116d4565b818103602083015261197b81856117fc565b905061198a60408301846117b7565b949350505050565b600060208201905081810360008301526119ac81846116f2565b905092915050565b600060208201905081810360008301526119ce818461174d565b905092915050565b60006020820190506119eb60008301846117a8565b92915050565b6000602082019050611a0660008301846117b7565b92915050565b60006020820190508181036000830152611a2581611832565b9050919050565b60006020820190508181036000830152611a4581611869565b9050919050565b60006020820190508181036000830152611a65816118a0565b9050919050565b6000602082019050611a8160008301846118d7565b92915050565b6000604082019050611a9c60008301856118d7565b611aa960208301846116e3565b9392505050565b6000602082019050611ac560008301846118de565b92915050565b6000604051905081810181811067ffffffffffffffff82111715611aee57600080fd5b8060405250919050565b600067ffffffffffffffff821115611b0f57600080fd5b602082029050602081019050919050565b600067ffffffffffffffff821115611b3757600080fd5b601f19601f8301169050602081019050919050565b6000602082019050919050565b6000602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60008115159050919050565b6000819050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60008115159050919050565b6000819050919050565b6000819050919050565b82818337600083830152505050565b60005b83811015611c59578082015181840152602081019050611c3e565b83811115611c68576000848401525b50505050565b6000601f19601f83011690509190505600a265627a7a72305820b49fe9b26a055060feb2131f342c36eb9f1c334f1eb6aa01ec17fe61f6a6d1196c6578706572696d656e74616cf50037
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.json
deleted file mode 100644
index 7d346074b937..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.json
+++ /dev/null
@@ -1,318 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      }
-    ],
-    "name": "remove",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      }
-    ],
-    "name": "getTokens",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      },
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "minterTokens",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "seven",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getAddressList",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address[]"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      }
-    ],
-    "name": "isValid",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_jurisdictions",
-        "type": "address"
-      }
-    ],
-    "name": "configureJurisdictionContract",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      }
-    ],
-    "name": "getJurisdiction",
-    "outputs": [
-      {
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "minters",
-    "outputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      },
-      {
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "name": "jurisdiction",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "minter",
-        "type": "address"
-      },
-      {
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "name": "jurisdiction",
-        "type": "bytes32"
-      }
-    ],
-    "name": "add",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_jurisdictions",
-        "type": "address"
-      },
-      {
-        "name": "_admin",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "minter",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "indexed": false,
-        "name": "jurisdiction",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "MinterAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "minter",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "indexed": false,
-        "name": "jurisdiction",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "MinterRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "name": "value",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnableFired",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.bin
deleted file mode 100644
index 0d8fd60d9025..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b506040516108d03803806108d083398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b61083d806100936000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806334a13a651461005157806360760cec1461007b5780637c41ad2c14610090578063a0071175146100b1575b600080fd5b61006461005f3660046105e2565b6100c4565b60405161007292919061066e565b60405180910390f35b61008e6100893660046106aa565b610206565b005b6100a361009e3660046106fa565b610282565b604051908152602001610072565b61008e6100bf3660046106aa565b610366565b600060606101676001600160a01b031663acb9cff960e01b8587866040516024016100f19392919061071c565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff000000000000000000000000000000000000000000000000000000009094169390931790925290516101479190610787565b600060405180830381855af49150503d8060008114610182576040519150601f19603f3d011682016040523d82523d6000602084013e610187565b606091505b50909250905060008261019b5760156101af565b818060200190518101906101af91906107b5565b60030b9050601681146101fd5760405162461bcd60e51b8152602060048201526011602482015270151bdad95b88189d5c9b8819985a5b1959607a1b60448201526064015b60405180910390fd5b50935093915050565b600080548190610220906001600160a01b031685856103c9565b604051919350915067ffffffffffffffff821690600090a16016821461027c5760405162461bcd60e51b8152602060048201526011602482015270151bdad95b88189d5c9b8819985a5b1959607a1b60448201526064016101f4565b50505050565b604080516001600160a01b03831660248083019190915282518083039091018152604490910182526020810180516001600160e01b03167f7c41ad2c00000000000000000000000000000000000000000000000000000000179052905160009182918291610167916102f49190610787565b6000604051808303816000865af19150503d8060008114610331576040519150601f19603f3d011682016040523d82523d6000602084013e610336565b606091505b50915091508161034757601561035b565b8080602001905181019061035b91906107b5565b60030b949350505050565b600080548190610380906001600160a01b031685856103c9565b90925090506016821461027c5760405162461bcd60e51b8152602060048201526011602482015270151bdad95b88189d5c9b8819985a5b1959607a1b60448201526064016101f4565b6000806000806101676001600160a01b031663acb9cff960e01b8888886040516024016103f89392919061071c565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff0000000000000000000000000000000000000000000000000000000090941693909317909252905161044e9190610787565b6000604051808303816000865af19150503d806000811461048b576040519150601f19603f3d011682016040523d82523d6000602084013e610490565b606091505b5091509150816104a357601560006104b7565b808060200190518101906104b791906107d0565b60039190910b9890975095505050505050565b67ffffffffffffffff811681146104e057600080fd5b50565b80356001600160a01b03811681146104fa57600080fd5b919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b8035600781900b81146104fa57600080fd5b600082601f83011261055157600080fd5b8135602067ffffffffffffffff8083111561056e5761056e6104ff565b8260051b604051601f19603f83011681018181108482111715610593576105936104ff565b6040529384528581018301938381019250878511156105b157600080fd5b83870191505b848210156105d7576105c88261052e565b835291830191908301906105b7565b979650505050505050565b6000806000606084860312156105f757600080fd5b8335610602816104ca565b9250610610602085016104e3565b9150604084013567ffffffffffffffff81111561062c57600080fd5b61063886828701610540565b9150509250925092565b60005b8381101561065d578181015183820152602001610645565b8381111561027c5750506000910152565b82151581526040602082015260008251806040840152610695816060850160208701610642565b601f01601f1916919091016060019392505050565b600080604083850312156106bd57600080fd5b82356106c8816104ca565b9150602083013567ffffffffffffffff8111156106e457600080fd5b6106f085828601610540565b9150509250929050565b60006020828403121561070c57600080fd5b610715826104e3565b9392505050565b6000606082016001600160a01b0386168352602067ffffffffffffffff86168185015260606040850152818551808452608086019150828701935060005b8181101561077957845160070b8352938301939183019160010161075a565b509098975050505050505050565b60008251610799818460208701610642565b9190910192915050565b8051600381900b81146104fa57600080fd5b6000602082840312156107c757600080fd5b610715826107a3565b600080604083850312156107e357600080fd5b6107ec836107a3565b915060208301516107fc816104ca565b80915050925092905056fea264697066735822122039270609a793ca999f79044e7b577008f97825a48f3a9ea788127103f637136564736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.json
deleted file mode 100644
index dc04b6023842..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.json
+++ /dev/null
@@ -1,115 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_tokenAddress",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": true,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "uint64",
-          "name": "totalSupply",
-          "type": "uint64"
-        }
-      ],
-      "name": "BurnedTokenInfo",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "amount",
-          "type": "uint64"
-        },
-        {
-          "internalType": "int64[]",
-          "name": "serialNumbers",
-          "type": "int64[]"
-        }
-      ],
-      "name": "burnToken",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "amount",
-          "type": "uint64"
-        },
-        {
-          "internalType": "address",
-          "name": "tokenAddress",
-          "type": "address"
-        },
-        {
-          "internalType": "int64[]",
-          "name": "serialNumbers",
-          "type": "int64[]"
-        }
-      ],
-      "name": "burnTokenDelegateCall",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "success",
-          "type": "bool"
-        },
-        {
-          "internalType": "bytes",
-          "name": "result",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint64",
-          "name": "amount",
-          "type": "uint64"
-        },
-        {
-          "internalType": "int64[]",
-          "name": "serialNumbers",
-          "type": "int64[]"
-        }
-      ],
-      "name": "burnTokenWithEvent",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "pauseToken",
-      "outputs": [
-        {
-          "internalType": "int256",
-          "name": "responseCode",
-          "type": "int256"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.bin
deleted file mode 100644
index 0746536a5ff0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060405162001bd838038062001bd8833981810160405281019062000037919062000095565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506200010f565b6000815190506200008f81620000f5565b92915050565b600060208284031215620000a857600080fd5b6000620000b8848285016200007e565b91505092915050565b6000620000ce82620000d5565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6200010081620000c1565b81146200010c57600080fd5b50565b611ab9806200011f6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806386ea0b2a1161005b57806386ea0b2a146100fd5780639261513314610119578063e0feff6714610135578063ff57baab1461015157610088565b80630631f08b1461008d5780631992530e146100a957806321a40e53146100c55780632c166d09146100e1575b600080fd5b6100a760048036038101906100a2919061175d565b61016d565b005b6100c360048036038101906100be919061175d565b61041b565b005b6100df60048036038101906100da919061175d565b6106c7565b005b6100fb60048036038101906100f6919061175d565b610973565b005b6101176004803603810190610112919061175d565b610c21565b005b610133600480360381019061012e919061175d565b610ecd565b005b61014f600480360381019061014a919061175d565b611177565b005b61016b6004803603810190610166919061175d565b611421565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631f3659d060e01b83836040516024016101bf929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161022991906118ad565b6000604051808303816000865af19150503d8060008114610266576040519150601f19603f3d011682016040523d82523d6000602084013e61026b565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff811180156102ad57600080fd5b506040519080825280602002602001820160405280156102dc5781602001602082028036833780820191505090505b506040516024016102ef939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161035991906118ad565b6000604051808303816000865af19150503d8060008114610396576040519150601f19603f3d011682016040523d82523d6000602084013e61039b565b606091505b5091509150600080836103b157601560006103c6565b828060200190518101906103c59190611721565b5b915060030b9150601660030b8214610413576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161040a90611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631f3659d060e01b838360405160240161046d929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104d791906118ad565b6000604051808303816000865af19150503d8060008114610514576040519150601f19603f3d011682016040523d82523d6000602084013e610519565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff8111801561055b57600080fd5b5060405190808252806020026020018201604052801561058a5781602001602082028036833780820191505090505b5060405160240161059d939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161060791906118ad565b600060405180830381855af49150503d8060008114610642576040519150601f19603f3d011682016040523d82523d6000602084013e610647565b606091505b50915091506000808361065d5760156000610672565b828060200190518101906106719190611721565b5b915060030b9150601660030b82146106bf576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106b690611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663515d72e360e01b8383604051602401610719929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161078391906118ad565b6000604051808303816000865af19150503d80600081146107c0576040519150601f19603f3d011682016040523d82523d6000602084013e6107c5565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff8111801561080757600080fd5b506040519080825280602002602001820160405280156108365781602001602082028036833780820191505090505b50604051602401610849939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108b391906118ad565b600060405180830381855af49150503d80600081146108ee576040519150601f19603f3d011682016040523d82523d6000602084013e6108f3565b606091505b509150915060008083610909576015600061091e565b8280602001905181019061091d9190611721565b5b915060030b9150601660030b821461096b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161096290611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663515d72e360e01b83836040516024016109c5929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a2f91906118ad565b6000604051808303816000865af19150503d8060008114610a6c576040519150601f19603f3d011682016040523d82523d6000602084013e610a71565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff81118015610ab357600080fd5b50604051908082528060200260200182016040528015610ae25781602001602082028036833780820191505090505b50604051602401610af5939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b5f91906118ad565b6000604051808303816000865af19150503d8060008114610b9c576040519150601f19603f3d011682016040523d82523d6000602084013e610ba1565b606091505b509150915060008083610bb75760156000610bcc565b82806020019051810190610bcb9190611721565b5b915060030b9150601660030b8214610c19576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c1090611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631f3659d060e01b8383604051602401610c73929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cdd91906118ad565b600060405180830381855af49150503d8060008114610d18576040519150601f19603f3d011682016040523d82523d6000602084013e610d1d565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff81118015610d5f57600080fd5b50604051908082528060200260200182016040528015610d8e5781602001602082028036833780820191505090505b50604051602401610da1939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610e0b91906118ad565b6000604051808303816000865af19150503d8060008114610e48576040519150601f19603f3d011682016040523d82523d6000602084013e610e4d565b606091505b509150915060008083610e635760156000610e78565b82806020019051810190610e779190611721565b5b915060030b9150601660030b8214610ec5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ebc90611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16631f3659d060e01b8383604051602401610f1f929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f8991906118ad565b600060405180830381855af49150503d8060008114610fc4576040519150601f19603f3d011682016040523d82523d6000602084013e610fc9565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff8111801561100b57600080fd5b5060405190808252806020026020018201604052801561103a5781602001602082028036833780820191505090505b5060405160240161104d939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110b791906118ad565b600060405180830381855af49150503d80600081146110f2576040519150601f19603f3d011682016040523d82523d6000602084013e6110f7565b606091505b50915091506000808361110d5760156000611122565b828060200190518101906111219190611721565b5b915060030b9150601660030b821461116f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161116690611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663515d72e360e01b83836040516024016111c9929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161123391906118ad565b600060405180830381855af49150503d806000811461126e576040519150601f19603f3d011682016040523d82523d6000602084013e611273565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff811180156112b557600080fd5b506040519080825280602002602001820160405280156112e45781602001602082028036833780820191505090505b506040516024016112f7939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161136191906118ad565b600060405180830381855af49150503d806000811461139c576040519150601f19603f3d011682016040523d82523d6000602084013e6113a1565b606091505b5091509150600080836113b757601560006113cc565b828060200190518101906113cb9190611721565b5b915060030b9150601660030b8214611419576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161141090611902565b60405180910390fd5b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663515d72e360e01b8383604051602401611473929190611922565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516114dd91906118ad565b600060405180830381855af49150503d8060008114611518576040519150601f19603f3d011682016040523d82523d6000602084013e61151d565b606091505b5050506000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8486600067ffffffffffffffff8111801561155f57600080fd5b5060405190808252806020026020018201604052801561158e5781602001602082028036833780820191505090505b506040516024016115a1939291906118c4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161160b91906118ad565b6000604051808303816000865af19150503d8060008114611648576040519150601f19603f3d011682016040523d82523d6000602084013e61164d565b606091505b5091509150600080836116635760156000611678565b828060200190518101906116779190611721565b5b915060030b9150601660030b82146116c5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116bc90611902565b60405180910390fd5b505050505050565b6000813590506116dc81611a3e565b92915050565b6000815190506116f181611a55565b92915050565b60008135905061170681611a6c565b92915050565b60008151905061171b81611a6c565b92915050565b6000806040838503121561173457600080fd5b6000611742858286016116e2565b92505060206117538582860161170c565b9150509250929050565b6000806040838503121561177057600080fd5b600061177e858286016116f7565b925050602061178f858286016116cd565b9150509250929050565b60006117a5838361184f565b60208301905092915050565b6117ba816119ab565b82525050565b60006117cb8261195b565b6117d5818561197e565b93506117e08361194b565b8060005b838110156118115781516117f88882611799565b975061180383611971565b9250506001810190506117e4565b5085935050505092915050565b600061182982611966565b611833818561198f565b9350611843818560208601611a0b565b80840191505092915050565b611858816119ca565b82525050565b600061186b60118361199a565b91507f546f6b656e206275726e206661696c65640000000000000000000000000000006000830152602082019050919050565b6118a7816119f7565b82525050565b60006118b9828461181e565b915081905092915050565b60006060820190506118d960008301866117b1565b6118e6602083018561189e565b81810360408301526118f881846117c0565b9050949350505050565b6000602082019050818103600083015261191b8161185e565b9050919050565b6000604082019050611937600083018561189e565b61194460208301846117b1565b9392505050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b60006119b6826119d7565b9050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b60005b83811015611a29578082015181840152602081019050611a0e565b83811115611a38576000848401525b50505050565b611a47816119ab565b8114611a5257600080fd5b50565b611a5e816119bd565b8114611a6957600080fd5b50565b611a75816119f7565b8114611a8057600080fd5b5056fea26469706673582212200231151599f4bd123b0b2cc37676d75dc79a093ef99fb1180b2d09c25e6e21ff64736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.json
deleted file mode 100644
index 9558dee7e2ad..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.json
+++ /dev/null
@@ -1,157 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_mixedMintTokenContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnCallAfterNestedMintCallWithPrecompileCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnCallAfterNestedMintCallWithPrecompileDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnCallAfterNestedMintDelegateCallWithPrecompileCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnCallAfterNestedMintDelegateCallWithPrecompileDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnDelegateCallAfterNestedMintCallWithPrecompileCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnDelegateCallAfterNestedMintCallWithPrecompileDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnDelegateCallAfterNestedMintDelegateCallWithPrecompileCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "burnDelegateCallAfterNestedMintDelegateCallWithPrecompileDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.bin
deleted file mode 100644
index 3a3255bc91f3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b506108a5806100206000396000f3fe6080604052600436106100405760003560e01c806319f88c7d146100495780631f3659d01461007c5780639f454e67146100aa578063cd801996146100ca57005b3661004757005b005b34801561005557600080fd5b506100696100643660046104b1565b6100ea565b6040519081526020015b60405180910390f35b34801561008857600080fd5b5061009c61009736600461054c565b610134565b6040516100739291906105db565b3480156100b657600080fd5b5061009c6100c536600461065e565b610249565b3480156100d657600080fd5b5061009c6100e536600461065e565b6103bd565b6000604051368482376020813683600089622dc6c0f28061012a5760207f546f6b656e206d696e742063616c6c636f6465206661696c6564200000000020fd5b5051949350505050565b600060606101677f278e0b880000000000000000000000000000000000000000000000000000000084868560405190808252806020026020018201604052801561019257816020015b606081526020019060019003908161017d5790505b506040516024016101a593929190610798565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff000000000000000000000000000000000000000000000000000000009094169390931790925290516101fb9190610829565b6000604051808303816000865af19150503d8060008114610238576040519150601f19603f3d011682016040523d82523d6000602084013e61023d565b606091505b50909590945092505050565b6000606061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b85878660405160240161028393929190610798565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff000000000000000000000000000000000000000000000000000000009094169390931790925290516102d99190610829565b600060405180830381855af49150503d8060008114610314576040519150601f19603f3d011682016040523d82523d6000602084013e610319565b606091505b50909250905060008261032d576015610341565b818060200190518101906103419190610845565b60030b9050601681146103b4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f546f6b656e206d696e74206661696c6564000000000000000000000000000000604482015260640160405180910390fd5b50935093915050565b6000606061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8587866040516024016103f793929190610798565b60408051601f198184030181529181526020820180516001600160e01b03167fffffffff0000000000000000000000000000000000000000000000000000000090941693909317909252905161044d9190610829565b600060405180830381855afa9150503d8060008114610314576040519150601f19603f3d011682016040523d82523d6000602084013e610319565b803573ffffffffffffffffffffffffffffffffffffffff811681146104ac57600080fd5b919050565b6000806000604084860312156104c657600080fd5b6104cf84610488565b9250602084013567ffffffffffffffff808211156104ec57600080fd5b818601915086601f83011261050057600080fd5b81358181111561050f57600080fd5b87602082850101111561052157600080fd5b6020830194508093505050509250925092565b803567ffffffffffffffff811681146104ac57600080fd5b6000806040838503121561055f57600080fd5b61056883610534565b915061057660208401610488565b90509250929050565b60005b8381101561059a578181015183820152602001610582565b838111156105a9576000848401525b50505050565b600081518084526105c781602086016020860161057f565b601f01601f19169290920160200192915050565b82151581526040602082015260006105f660408301846105af565b949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715610656576106566105fe565b604052919050565b60008060006060848603121561067357600080fd5b61067c84610534565b9250602061068b818601610488565b925060408086013567ffffffffffffffff808211156106a957600080fd5b818801915088601f8301126106bd57600080fd5b8135818111156106cf576106cf6105fe565b8060051b6106de86820161062d565b918252838101860191868101908c8411156106f857600080fd5b87860192505b83831015610786578235858111156107165760008081fd5b8601603f81018e136107285760008081fd5b888101358681111561073c5761073c6105fe565b61074e601f8201601f19168b0161062d565b8181528f8a8385010111156107635760008081fd5b818a84018c83013760009181018b019190915283525091870191908701906106fe565b80985050505050505050509250925092565b60006060820173ffffffffffffffffffffffffffffffffffffffff86168352602067ffffffffffffffff8616818501526060604085015281855180845260808601915060808160051b870101935082870160005b8281101561081a57607f198887030184526108088683516105af565b955092840192908401906001016107ec565b50939998505050505050505050565b6000825161083b81846020870161057f565b9190910192915050565b60006020828403121561085757600080fd5b81518060030b811461086857600080fd5b939250505056fea264697066735822122043071987fc0b0c1e3869eb79ab4b98b3dab85b9e7295a0aceb5d18b141b11b1e64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.json
deleted file mode 100644
index bcc4ae0740d4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.json
+++ /dev/null
@@ -1,131 +0,0 @@
-[
-  {
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_customData",
-        "type": "bytes"
-      }
-    ],
-    "name": "callCodeToContractWithoutAmount",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "output",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "mintTokenCall",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "result",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenDelegateCall",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "result",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenStaticCall",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes",
-        "name": "result",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "receive"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.bin
deleted file mode 100644
index 484e60a469f3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b506104628061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061004a575f3560e01c80634e696a891461004e5780635d289800146100585780636b9edf51146100625780636c0926d81461006c575b5f80fd5b610056610076565b005b6100606100b7565b005b61006a61016b565b005b610074610173565b005b5f6040518060400160405280600d81526020017f48656c6c6f2c20576f726c642100000000000000000000000000000000000000815250905060205f805e50565b5f6040518060400160405280600d81526020017f48656c6c6f2c20576f726c64210000000000000000000000000000000000000081525090505f600a73ffffffffffffffffffffffffffffffffffffffff168260405161011791906102e9565b5f60405180830381855afa9150503d805f811461014f576040519150601f19603f3d011682016040523d82523d5f602084013e610154565b606091505b505090508015610167576101666102ff565b5b5050565b612b67600a5d565b5f6040518060e0016040528060c0815260200161036d60c0913990505f60405180606001604052806040815260200161032d6040913990505f80600a73ffffffffffffffffffffffffffffffffffffffff16846040516101d391906102e9565b5f60405180830381855afa9150503d805f811461020b576040519150601f19603f3d011682016040523d82523d5f602084013e610210565b606091505b509150915081610223576102226102ff565b5b6040815114610235576102346102ff565b5b8060405160200161024691906102e9565b604051602081830303815290604052805190602001208360405160200161026d91906102e9565b6040516020818303038152906040528051906020012014610291576102906102ff565b5b50505050565b5f81519050919050565b5f81905092915050565b8281835e5f83830152505050565b5f6102c382610297565b6102cd81856102a1565b93506102dd8185602086016102ab565b80840191505092915050565b5f6102f482846102b9565b915081905092915050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52600160045260245ffdfe000000000000000000000000000000000000000000000000000000000000100073eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001010657f37554c781402a22917dee2f75def7ab966d7b770905398eba3c444014623ce31cf9759a5c8daf3a357992f9f3dd7f9339d8998bc8e68373e54f00b75e0000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a2646970667358221220b3653aa1fdac5db0df3a8822a73e2961db6b28771c53ddedd98e0ec9ce15558464736f6c63430008190033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.json
deleted file mode 100644
index fec55086064f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "kzg_precompile_success_case",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "try_kzg_precompile",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "try_mcopy",
-    "outputs": [],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "try_transient_storage",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.bin
deleted file mode 100644
index 875c2d086437..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052602a6000806101000a81548163ffffffff021916908363ffffffff1602179055506102ef806100346000396000f3fe6080604052600436106100345760003560e01c80632b6adf43146100365780633d99e80d146101015780634bfdab7014610142575b005b6100ff6004803603604081101561004c57600080fd5b81019080803563ffffffff1690602001909291908035906020019064010000000081111561007957600080fd5b82018360208201111561008b57600080fd5b803590602001918460018302840111640100000000831117156100ad57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610179565b005b34801561010d57600080fd5b506101406004803603602081101561012457600080fd5b81019080803563ffffffff16906020019092919050505061027e565b005b34801561014e57600080fd5b506101576102a1565b604051808263ffffffff1663ffffffff16815260200191505060405180910390f35b60008263ffffffff166effffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc60019081150290604051600060405180830381858888f193505050501580156101dc573d6000803e3d6000fd5b507f930f628a0950173c55b8f7d31636aa82e481f09d70191adc38b8c8cd186a0ad7826040518080602001828103825283818151815260200191508051906020019080838360005b8381101561023f578082015181840152602081019050610224565b50505050905090810190601f16801561026c5780820380516001836020036101000a031916815260200191505b509250505060405180910390a1505050565b806000806101000a81548163ffffffff021916908363ffffffff16021790555050565b60008060009054906101000a900463ffffffff1690509056fea265627a7a723158200cb3f453f8965b28a962660b8038031e303f4d81fd18f19bac1db609100dd14864736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.json
deleted file mode 100644
index 51e0ca262386..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.json
+++ /dev/null
@@ -1,76 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "saying",
-        "type": "string"
-      }
-    ],
-    "name": "Boast",
-    "type": "event"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "no",
-        "type": "uint32"
-      }
-    ],
-    "name": "believeIn",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "toNum",
-        "type": "uint32"
-      },
-      {
-        "internalType": "string",
-        "name": "saying",
-        "type": "string"
-      }
-    ],
-    "name": "donate",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "pick",
-    "outputs": [
-      {
-        "internalType": "uint32",
-        "name": "",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.bin
deleted file mode 100644
index fd36062eaf2c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50600080546001600160a01b0319166101671790556104ac806100346000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80636711ed4f1461003b5780638d3e158914610075575b600080fd5b61004e6100493660046102b2565b610088565b6040805160039390930b835267ffffffffffffffff90911660208301520160405180910390f35b61004e610083366004610329565b61016e565b600080546040518291829182916001600160a01b0316906100b190899089908990602401610395565b60408051601f198184030181529181526020820180516001600160e01b0316636b48868360e11b179052516100e691906103c9565b6000604051808303816000865af19150503d8060008114610123576040519150601f19603f3d011682016040523d82523d6000602084013e610128565b606091505b50915091508161013a5760008061014e565b8080602001905181019061014e9190610404565b90945092506016600385900b1461016457600080fd5b5050935093915050565b600080546040518291829182916001600160a01b03169061019790899089908990602401610444565b60408051601f198184030181529181526020820180516001600160e01b031663acb9cff960e01b179052516100e691906103c9565b80356001600160a01b03811681146101e357600080fd5b919050565b8035600781900b81146101e357600080fd5b634e487b7160e01b600052604160045260246000fd5b600082601f83011261022157600080fd5b8135602067ffffffffffffffff8083111561023e5761023e6101fa565b8260051b604051601f19603f83011681018181108482111715610263576102636101fa565b60405293845285810183019383810192508785111561028157600080fd5b83870191505b848210156102a757610298826101e8565b83529183019190830190610287565b979650505050505050565b6000806000606084860312156102c757600080fd5b6102d0846101cc565b92506102de602085016101e8565b9150604084013567ffffffffffffffff8111156102fa57600080fd5b61030686828701610210565b9150509250925092565b67ffffffffffffffff8116811461032657600080fd5b50565b60008060006060848603121561033e57600080fd5b610347846101cc565b925060208401356102de81610310565b600081518084526020808501945080840160005b8381101561038a57815160070b8752958201959082019060010161036b565b509495945050505050565b6001600160a01b03841681528260070b60208201526060604082015260006103c06060830184610357565b95945050505050565b6000825160005b818110156103ea57602081860181015185830152016103d0565b818111156103f9576000828501525b509190910192915050565b6000806040838503121561041757600080fd5b82518060030b811461042857600080fd5b602084015190925061043981610310565b809150509250929050565b6001600160a01b038416815267ffffffffffffffff831660208201526060604082015260006103c0606083018461035756fea26469706673582212202d4b882e848a624a26b2db896be9c67c770370581079f0a7b24aaf109a71b5da64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.json
deleted file mode 100644
index f45132a9c792..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "_amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "_serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnTokenV1",
-    "outputs": [
-      {
-        "internalType": "int32",
-        "name": "responseCode",
-        "type": "int32"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "_amount",
-        "type": "int64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "_serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnTokenV2",
-    "outputs": [
-      {
-        "internalType": "int32",
-        "name": "responseCode",
-        "type": "int32"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.bin
deleted file mode 100644
index 59305c9ad665..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600060055534801561001557600080fd5b5060405161091d38038061091d8339818101604052602081101561003857600080fd5b8101908080519060200190929190505050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610884806100996000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c8063d1ee91a81161005b578063d1ee91a814610116578063ec8aff6e14610120578063ef641f4414610154578063f51df6bf1461015e5761007d565b80633b33c702146100825780636e077342146100da578063c6b463d3146100f8575b600080fd5b6100ae6004803603602081101561009857600080fd5b8101908080359060200190929190505050610168565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100e261019b565b6040518082815260200191505060405180910390f35b6101006101a1565b6040518082815260200191505060405180910390f35b61011e6101a6565b005b610128610305565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b61015c61033d565b005b6101666106ed565b005b6001816004811061017557fe5b016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60055481565b600481565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610267576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f4f6e6c792074686520444a2063616e2073746f7020746865206d75736963000081525060200191505060405180910390fd5b600060149054906101000a900460ff166102e9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f4d75736963206973206e6f7420706c6179696e6700000000000000000000000081525060200191505060405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b600060016005546004811061031657fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600060149054906101000a900460ff166103bf576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f546865204d75736963206973206e6f7420506c6179696e67000000000000000081525060200191505060405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610481576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f54686520444a2063616e6e6f7420706c6179000000000000000000000000000081525060200191505060405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff1660016000600481106104a657fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415801561054657503373ffffffffffffffffffffffffffffffffffffffff166001806004811061050b57fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614155b80156105ad57503373ffffffffffffffffffffffffffffffffffffffff16600160026004811061057257fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614155b801561061457503373ffffffffffffffffffffffffffffffffffffffff1660016003600481106105d957fe5b0160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614155b610686576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f596f752061726520616c7265616479207365617465642e00000000000000000081525060200191505060405180910390fd5b3360016005546004811061069657fe5b0160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506004600160055401816106e457fe5b06600581905550565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146107ae576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f4f6e6c792074686520444a2063616e20737461727420746865206d757369630081525060200191505060405180910390fd5b600060149054906101000a900460ff1615610831576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f4d7573696320697320616c726561647920706c6179696e67000000000000000081525060200191505060405180910390fd5b6001600060146101000a81548160ff02191690831515021790555056fea26469706673582212209736a0ee33a6d9fcab00ee00741556922d051c14b858cebebc87799373f8a1d764736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.json b/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.json
deleted file mode 100644
index 75af724f3998..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.json
+++ /dev/null
@@ -1,92 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_dj",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "hotSeat",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "seatCount",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "seats",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "sitDown",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "startMusic",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "stopMusic",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "whoIsOnTheBubble",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "hotSeatAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.bin
deleted file mode 100644
index ca61e3167d78..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600080546001600160a01b0319166001600160a01b0317905534801561002957600080fd5b50610c9c806100396000396000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c8063618dc65e1161008c5780638f85b0a6116100665780638f85b0a6146101a85780639b23d3d9146101bb578063ef089fd4146101ce578063ffaec81a146101e157600080fd5b8063618dc65e1461016f578063628c6eee146101825780638021f3c51461019557600080fd5b80633ad4d81e116100bd5780633ad4d81e14610136578063427195be146101495780635d3f288b1461015c57600080fd5b806315dacbea146100e457806328f010221461010e5780632e8341ac14610123575b600080fd5b6100f76100f2366004610868565b6101f4565b60405160079190910b815260200160405180910390f35b61012161011c3660046108b3565b6102e8565b005b6101216101313660046108b3565b61036a565b6101216101443660046109a3565b610394565b6101216101573660046108b3565b6103ab565b61012161016a3660046109e0565b6103b9565b61012161017d366004610a2e565b6104d4565b6101216101903660046108b3565b6105c2565b6101216101a33660046108b3565b6105dc565b6101216101b63660046109a3565b6105f5565b6100f76101c9366004610868565b61060e565b6101216101dc3660046108b3565b610653565b6101216101ef3660046108b3565b61066b565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102739190610b04565b6000604051808303816000865af19150503d80600081146102b0576040519150601f19603f3d011682016040523d82523d6000602084013e6102b5565b606091505b5091509150816102c65760156102da565b808060200190518101906102da9190610b20565b60030b979650505050505050565b60408051600180825281830190925260009160208083019080368337505060015482519293506001600160a01b03169183915060009061032a5761032a610b43565b60200260200101906001600160a01b031690816001600160a01b03168152505060006103568383610739565b90506016811461036557600080fd5b505050565b60008054610381906001600160a01b031683610816565b90506016811461039057600080fd5b5050565b60008054610381906001600160a01b031683610739565b606060006103568383610739565b6000815160016103c99190610b6f565b67ffffffffffffffff8111156103e1576103e16108d5565b60405190808252806020026020018201604052801561040a578160200160208202803683370190505b50905060005b825181101561046f5782818151811061042b5761042b610b43565b602002602001015182828151811061044557610445610b43565b6001600160a01b03909216602092830291909101909101528061046781610b87565b915050610410565b60005482516001600160a01b039091169083908390811061049257610492610b43565b60200260200101906001600160a01b031690816001600160a01b03168152505060006104be8585610739565b9050601681146104cd57600080fd5b5050505050565b6000806101676001600160a01b031663618dc65e60e01b85856040516024016104fe929190610bce565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161053c9190610b04565b6000604051808303816000865af19150503d8060008114610579576040519150601f19603f3d011682016040523d82523d6000602084013e61057e565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516105b4929190610bf0565b60405180910390a150505050565b6001546000906103819083906001600160a01b0316610816565b600254600090610381906001600160a01b031683610816565b600254600090610381906001600160a01b031683610739565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a401610235565b600080546103819083906001600160a01b0316610816565b60408051600380825260808201909252600091602082016060803683370190505090506001600160a01b03816000815181106106a9576106a9610b43565b60200260200101906001600160a01b031690816001600160a01b03168152505073fffffffffffffffffffffffffffffffffccccccc816001815181106106f1576106f1610b43565b60200260200101906001600160a01b031690816001600160a01b03168152505073ffffffffffffffffffffffffffffffffbbbbbbbb8160028151811061032a5761032a610b43565b60008060006101676001600160a01b0316632e63879b60e01b8686604051602401610765929190610c0b565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516107a39190610b04565b6000604051808303816000865af19150503d80600081146107e0576040519150601f19603f3d011682016040523d82523d6000602084013e6107e5565b606091505b5091509150816107f657601561080a565b8080602001905181019061080a9190610b20565b60030b95945050505050565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063248a35ef60e11b90606401610765565b80356001600160a01b038116811461086357600080fd5b919050565b6000806000806080858703121561087e57600080fd5b6108878561084c565b93506108956020860161084c565b92506108a36040860161084c565b9396929550929360600135925050565b6000602082840312156108c557600080fd5b6108ce8261084c565b9392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff81118282101715610914576109146108d5565b604052919050565b600082601f83011261092d57600080fd5b8135602067ffffffffffffffff821115610949576109496108d5565b8160051b6109588282016108eb565b928352848101820192828101908785111561097257600080fd5b83870192505b84831015610998576109898361084c565b82529183019190830190610978565b979650505050505050565b6000602082840312156109b557600080fd5b813567ffffffffffffffff8111156109cc57600080fd5b6109d88482850161091c565b949350505050565b600080604083850312156109f357600080fd5b6109fc8361084c565b9150602083013567ffffffffffffffff811115610a1857600080fd5b610a248582860161091c565b9150509250929050565b60008060408385031215610a4157600080fd5b610a4a8361084c565b915060208084013567ffffffffffffffff80821115610a6857600080fd5b818601915086601f830112610a7c57600080fd5b813581811115610a8e57610a8e6108d5565b610aa0601f8201601f191685016108eb565b91508082528784828501011115610ab657600080fd5b80848401858401376000848284010152508093505050509250929050565b60005b83811015610aef578181015183820152602001610ad7565b83811115610afe576000848401525b50505050565b60008251610b16818460208701610ad4565b9190910192915050565b600060208284031215610b3257600080fd5b81518060030b81146108ce57600080fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60008219821115610b8257610b82610b59565b500190565b6000600019821415610b9b57610b9b610b59565b5060010190565b60008151808452610bba816020860160208601610ad4565b601f01601f19169290920160200192915050565b6001600160a01b03831681526040602082015260006109d86040830184610ba2565b82151581526040602082015260006109d86040830184610ba2565b6000604082016001600160a01b0380861684526020604081860152828651808552606087019150828801945060005b81811015610c58578551851683529483019491830191600101610c3a565b50909897505050505050505056fea264697066735822122005fe556b1d267adee951c1c2685839bc1109c4e53e3650020d7b9fcd7c1e10ea64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.json
deleted file mode 100644
index 55fd52c17a9c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.json
+++ /dev/null
@@ -1,242 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenWithNonExistingAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenWithNonExistingTokenAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenWithNullAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenWithNullTokenAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokensWithEmptyTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "associateTokensWithNonExistingAccountAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokensWithNonExistingTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "associateTokensWithNullAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokensWithNullTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "associateTokensWithTokensArrayWithSomeNonExistingAddresses",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.bin
deleted file mode 100644
index cc74e29d6697..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610b50806100206000396000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c80639b5acce91161008c578063d9893c6511610066578063d9893c65146101a8578063da9a49e1146101bb578063e325b65f146101c3578063f5831fbb146101cb57600080fd5b80639b5acce91461016f578063bc39103414610182578063c57dbbd71461019557600080fd5b80635f100a45116100bd5780635f100a4514610136578063618dc65e146101495780639b23d3d91461015c57600080fd5b806315dacbea146100e4578063260078631461010e578063526656a214610123575b600080fd5b6100f76100f236600461070e565b6101de565b60405160079190910b815260200160405180910390f35b61012161011c366004610759565b6102d2565b005b610121610131366004610759565b610374565b61012161014436600461085d565b6103cc565b61012161015736600461089a565b6103dd565b6100f761016a36600461070e565b6104cb565b61012161017d366004610940565b610510565b610121610190366004610759565b610520565b6101216101a3366004610940565b610530565b6101216101b6366004610759565b610546565b6101216105d0565b6101216105e0565b6101216101d936600461085d565b6105f7565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161025d91906109ba565b6000604051808303816000865af19150503d806000811461029a576040519150601f19603f3d011682016040523d82523d6000602084013e61029f565b606091505b5091509150816102b05760156102c4565b808060200190518101906102c491906109e8565b60030b979650505050505050565b604080516002808252606082018352600092602083019080368337019050509050641caab5c3b38160018151811061030c5761030c610a03565b602002602001019060070b908160070b81525050644ad03e43698160028151811061033957610339610a03565b602002602001019060070b908160070b8152505060008061035c84600085610609565b90925090506016821461036e57600080fd5b50505050565b6000806103b583678000000000000002835b6040519080825280602002602001820160405280156103af578160200160208202803683370190505b50610609565b9092509050601682146103c757600080fd5b505050565b600080600061035c83600086610609565b6000806101676001600160a01b031663618dc65e60e01b8585604051602401610407929190610a45565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161044591906109ba565b6000604051808303816000865af19150503d8060008114610482576040519150601f19603f3d011682016040523d82523d6000602084013e610487565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516104bd929190610a67565b60405180910390a150505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a40161021f565b60008061035c8460001985610609565b6000806103b58360001983610386565b60008061035c8467800000000000000285610609565b604080516002808252606082018352600092602083019080368337019050509050641caab5c3b38160018151811061058057610580610a03565b602002602001019060070b908160070b81525050644ad03e4369816002815181106105ad576105ad610a03565b602002602001019060070b908160070b8152505060008061035c84600185610609565b600080806103b581600181610386565b6001600160a01b036000806103b583600183610386565b6001600160a01b0360008061035c8382865b6000806000806101676001600160a01b031663d6910d0660e01b88888860405160240161063893929190610a82565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161067691906109ba565b6000604051808303816000865af19150503d80600081146106b3576040519150601f19603f3d011682016040523d82523d6000602084013e6106b8565b606091505b5091509150816106cb57601560006106df565b808060200190518101906106df9190610ae3565b60039190910b9890975095505050505050565b80356001600160a01b038116811461070957600080fd5b919050565b6000806000806080858703121561072457600080fd5b61072d856106f2565b935061073b602086016106f2565b9250610749604086016106f2565b9396929550929360600135925050565b60006020828403121561076b57600080fd5b610774826106f2565b9392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156107ba576107ba61077b565b604052919050565b8060070b81146107d157600080fd5b50565b600082601f8301126107e557600080fd5b8135602067ffffffffffffffff8211156108015761080161077b565b8160051b610810828201610791565b928352848101820192828101908785111561082a57600080fd5b83870192505b84831015610852578235610843816107c2565b82529183019190830190610830565b979650505050505050565b60006020828403121561086f57600080fd5b813567ffffffffffffffff81111561088657600080fd5b610892848285016107d4565b949350505050565b600080604083850312156108ad57600080fd5b6108b6836106f2565b915060208084013567ffffffffffffffff808211156108d457600080fd5b818601915086601f8301126108e857600080fd5b8135818111156108fa576108fa61077b565b61090c601f8201601f19168501610791565b9150808252878482850101111561092257600080fd5b80848401858401376000848284010152508093505050509250929050565b6000806040838503121561095357600080fd5b61095c836106f2565b9150602083013567ffffffffffffffff81111561097857600080fd5b610984858286016107d4565b9150509250929050565b60005b838110156109a9578181015183820152602001610991565b8381111561036e5750506000910152565b600082516109cc81846020870161098e565b9190910192915050565b8051600381900b811461070957600080fd5b6000602082840312156109fa57600080fd5b610774826109d6565b634e487b7160e01b600052603260045260246000fd5b60008151808452610a3181602086016020860161098e565b601f01601f19169290920160200192915050565b6001600160a01b03831681526040602082015260006108926040830184610a19565b82151581526040602082015260006108926040830184610a19565b6000606082016001600160a01b03861683526020858185015260606040850152818551808452608086019150828701935060005b81811015610ad557845160070b83529383019391830191600101610ab6565b509098975050505050505050565b60008060408385031215610af657600080fd5b610aff836109d6565b91506020830151610b0f816107c2565b80915050925092905056fea2646970667358221220945a273d5210c6622e943ea4e0d230e59441e37a978b8bcf46f32c3341aa15d964736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.json
deleted file mode 100644
index bbd66d5fbbd0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.json
+++ /dev/null
@@ -1,235 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "burnFungibleInvalidAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "burnFungibleNegativeLong",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "burnFungibleWithExtremeAmounts",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "burnFungibleWithInvalidSerials",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "burnFungibleZeroAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "int64[]",
-        "name": "serials",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnNFTInvalidAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serials",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnNFTNegativeLong",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serials",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnNFTWithExtremeAmounts",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "burnNFTWithInvalidSerials",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "int64[]",
-        "name": "serials",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnNFTZeroAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.bin
deleted file mode 100644
index 84dec8e7345a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600080546001600160a01b0319166001600160a01b0317905534801561002957600080fd5b50610cce806100396000396000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c80638384b8001161008c5780639b682a39116100665780639b682a39146101a8578063a7182091146101bb578063c66a68c4146101ce578063e9287299146101e157600080fd5b80638384b8001461016f57806393a088af146101825780639b23d3d91461019557600080fd5b8063618dc65e116100bd578063618dc65e1461013657806376d4334814610149578063792e8b691461015c57600080fd5b806313159145146100e457806315dacbea146100f95780632a93233e14610123575b600080fd5b6100f76100f236600461089a565b6101f4565b005b61010c6101073660046108bc565b610302565b60405160079190910b815260200160405180910390f35b6100f76101313660046109d5565b6103f6565b6100f7610144366004610a23565b610511565b6100f761015736600461089a565b6105ff565b6100f761016a36600461089a565b610629565b6100f761017d36600461089a565b610641565b6100f761019036600461089a565b61064f565b61010c6101a33660046108bc565b610669565b6100f76101b6366004610ac9565b6106ae565b6100f76101c936600461089a565b6106c5565b6100f76101dc36600461089a565b6106de565b6100f76101ef366004610ac9565b610720565b60408051600380825260808201909252600091602082016060803683370190505090506001600160a01b038160008151811061023257610232610b06565b60200260200101906001600160a01b031690816001600160a01b03168152505073fffffffffffffffffffffffffffffffffccccccc8160018151811061027a5761027a610b06565b60200260200101906001600160a01b031690816001600160a01b03168152505073ffffffffffffffffffffffffffffffffbbbbbbbb816002815181106102c2576102c2610b06565b60200260200101906001600160a01b031690816001600160a01b03168152505060006102ee8383610735565b9050601681146102fd57600080fd5b505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516103819190610b4c565b6000604051808303816000865af19150503d80600081146103be576040519150601f19603f3d011682016040523d82523d6000602084013e6103c3565b606091505b5091509150816103d45760156103e8565b808060200190518101906103e89190610b68565b60030b979650505050505050565b6000815160016104069190610ba1565b67ffffffffffffffff81111561041e5761041e610907565b604051908082528060200260200182016040528015610447578160200160208202803683370190505b50905060005b82518110156104ac5782818151811061046857610468610b06565b602002602001015182828151811061048257610482610b06565b6001600160a01b0390921660209283029190910190910152806104a481610bb9565b91505061044d565b60005482516001600160a01b03909116908390839081106104cf576104cf610b06565b60200260200101906001600160a01b031690816001600160a01b03168152505060006104fb8585610735565b90506016811461050a57600080fd5b5050505050565b6000806101676001600160a01b031663618dc65e60e01b858560405160240161053b929190610c00565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516105799190610b4c565b6000604051808303816000865af19150503d80600081146105b6576040519150601f19603f3d011682016040523d82523d6000602084013e6105bb565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516105f1929190610c22565b60405180910390a150505050565b60008054610616906001600160a01b031683610812565b90506016811461062557600080fd5b5050565b600080546106169083906001600160a01b0316610848565b606060006102ee8383610735565b6001546000906106169083906001600160a01b0316610848565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a401610343565b60008054610616906001600160a01b031683610735565b600254600090610616906001600160a01b031683610848565b60408051600180825281830190925260009160208083019080368337505060015482519293506001600160a01b0316918391506000906102c2576102c2610b06565b600254600090610616906001600160a01b0316835b60008060006101676001600160a01b03166378b6391860e01b8686604051602401610761929190610c3d565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161079f9190610b4c565b6000604051808303816000865af19150503d80600081146107dc576040519150601f19603f3d011682016040523d82523d6000602084013e6107e1565b606091505b5091509150816107f2576015610806565b808060200190518101906108069190610b68565b60030b95945050505050565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063248a35ef60e11b90606401610761565b6040516001600160a01b038381166024830152821660448201526000908190819061016790630132f29d60e31b90606401610761565b80356001600160a01b038116811461089557600080fd5b919050565b6000602082840312156108ac57600080fd5b6108b58261087e565b9392505050565b600080600080608085870312156108d257600080fd5b6108db8561087e565b93506108e96020860161087e565b92506108f76040860161087e565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561094657610946610907565b604052919050565b600082601f83011261095f57600080fd5b8135602067ffffffffffffffff82111561097b5761097b610907565b8160051b61098a82820161091d565b92835284810182019282810190878511156109a457600080fd5b83870192505b848310156109ca576109bb8361087e565b825291830191908301906109aa565b979650505050505050565b600080604083850312156109e857600080fd5b6109f18361087e565b9150602083013567ffffffffffffffff811115610a0d57600080fd5b610a198582860161094e565b9150509250929050565b60008060408385031215610a3657600080fd5b610a3f8361087e565b915060208084013567ffffffffffffffff80821115610a5d57600080fd5b818601915086601f830112610a7157600080fd5b813581811115610a8357610a83610907565b610a95601f8201601f1916850161091d565b91508082528784828501011115610aab57600080fd5b80848401858401376000848284010152508093505050509250929050565b600060208284031215610adb57600080fd5b813567ffffffffffffffff811115610af257600080fd5b610afe8482850161094e565b949350505050565b634e487b7160e01b600052603260045260246000fd5b60005b83811015610b37578181015183820152602001610b1f565b83811115610b46576000848401525b50505050565b60008251610b5e818460208701610b1c565b9190910192915050565b600060208284031215610b7a57600080fd5b81518060030b81146108b557600080fd5b634e487b7160e01b600052601160045260246000fd5b60008219821115610bb457610bb4610b8b565b500190565b6000600019821415610bcd57610bcd610b8b565b5060010190565b60008151808452610bec816020860160208601610b1c565b601f01601f19169290920160200192915050565b6001600160a01b0383168152604060208201526000610afe6040830184610bd4565b8215158152604060208201526000610afe6040830184610bd4565b6000604082016001600160a01b0380861684526020604081860152828651808552606087019150828801945060005b81811015610c8a578551851683529483019491830191600101610c6c565b50909897505050505050505056fea26469706673582212209f0f8b7076287450726365ab17e07b010ea83c37e6f31837d40835ea02eb676064736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.json
deleted file mode 100644
index fee0cc579e4a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.json
+++ /dev/null
@@ -1,242 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokenWithNonExistingAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokenWithNonExistingTokenAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokenWithNullAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokenWithNullTokenAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokensWithEmptyTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "dissociateTokensWithNonExistingAccountAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokensWithNonExistingTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "dissociateTokensWithNullAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateTokensWithNullTokensArray",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "dissociateTokensWithTokensArrayWithSomeNonExistingAddresses",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.bin
deleted file mode 100644
index c043847633eb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561000f575f80fd5b506106ff8061001d5f395ff3fe608060405234801561000f575f80fd5b5060043610610055575f3560e01c80631305c2e01461005957806315dacbea1461006e578063618dc65e146100995780639aad04e5146100ba5780639b23d3d9146100cd575b5f80fd5b61006c610067366004610462565b6100e0565b005b61008161007c3660046104a2565b6101bb565b60405160079190910b81526020015b60405180910390f35b6100ac6100a73660046104fe565b6102aa565b604051610090929190610607565b61006c6100c8366004610462565b6103c1565b6100816100db3660046104a2565b610403565b5f80610167630aed65f560e11b8686866100fc5f196001610627565b6040516001600160a01b039485166024820152928416604484015292166064820152608481019190915260a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610168919061064c565b5f604051808303815f865af19150503d805f81146101a1576040519150601f19603f3d011682016040523d82523d5f602084013e6101a6565b606091505b5091509150816101b4575f80fd5b5050505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290525f908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610239919061064c565b5f604051808303815f865af19150503d805f8114610272576040519150601f19603f3d011682016040523d82523d5f602084013e610277565b606091505b50915091508161028857601561029c565b8080602001905181019061029c9190610667565b60030b979650505050505050565b5f60605f806101676001600160a01b031663618dc65e60e01b87876040516024016102d692919061068e565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610314919061064c565b5f604051808303815f865af19150503d805f811461034d576040519150601f19603f3d011682016040523d82523d5f602084013e610352565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516103889291906106af565b60405180910390a1816103ab57601560405180602001604052805f8152506103af565b6016815b60039190910b97909650945050505050565b6040516001600160a01b0384811660248301528381166044830152821660648201525f1960848201525f90819061016790630aed65f560e11b9060a40161012a565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290525f908190819061016790639b23d3d960e01b9060a4016101fb565b80356001600160a01b038116811461045d575f80fd5b919050565b5f805f60608486031215610474575f80fd5b61047d84610447565b925061048b60208501610447565b915061049960408501610447565b90509250925092565b5f805f80608085870312156104b5575f80fd5b6104be85610447565b93506104cc60208601610447565b92506104da60408601610447565b9396929550929360600135925050565b634e487b7160e01b5f52604160045260245ffd5b5f806040838503121561050f575f80fd5b61051883610447565b9150602083013567ffffffffffffffff80821115610534575f80fd5b818501915085601f830112610547575f80fd5b813581811115610559576105596104ea565b604051601f8201601f19908116603f01168101908382118183101715610581576105816104ea565b81604052828152886020848701011115610599575f80fd5b826020860160208301375f6020848301015280955050505050509250929050565b5f5b838110156105d45781810151838201526020016105bc565b50505f910152565b5f81518084526105f38160208601602086016105ba565b601f01601f19169290920160200192915050565b828152604060208201525f61061f60408301846105dc565b949350505050565b8082018082111561064657634e487b7160e01b5f52601160045260245ffd5b92915050565b5f825161065d8184602087016105ba565b9190910192915050565b5f60208284031215610677575f80fd5b81518060030b8114610687575f80fd5b9392505050565b6001600160a01b0383168152604060208201525f61061f60408301846105dc565b8215158152604060208201525f61061f60408301846105dc56fea2646970667358221220d770b651f3a7d5c6d332ddb89db588de3f0c3385ed4cf415be46dab232cb2c3064736f6c63430008170033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.json
deleted file mode 100644
index 35711fecbfb6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.json
+++ /dev/null
@@ -1,164 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "response",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      }
-    ],
-    "name": "transferFromUnderflowAmountValue",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      }
-    ],
-    "name": "transferFromWithOverflowAmountValue",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.bin
deleted file mode 100644
index 762513ee9414..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561000f575f80fd5b506114538061001d5f395ff3fe608060405234801561000f575f80fd5b5060043610610060575f3560e01c806315dacbea146100645780633ffc1e6114610094578063618dc65e146100b057806375366bf1146100e15780638c997b14146100fd5780639b23d3d914610119575b5f80fd5b61007e60048036038101906100799190610969565b610149565b60405161008b91906109e8565b60405180910390f35b6100ae60048036038101906100a99190610c54565b610261565b005b6100ca60048036038101906100c59190610cc0565b610390565b6040516100d8929190610dac565b60405180910390f35b6100fb60048036038101906100f69190610e04565b6104e5565b005b61011760048036038101906101129190610e70565b61054a565b005b610133600480360381019061012e9190610969565b610642565b60405161014091906109e8565b60405180910390f35b5f805f61016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016101849493929190610ee8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101ee9190610f65565b5f604051808303815f865af19150503d805f8114610227576040519150601f19603f3d011682016040523d82523d5f602084013e61022c565b606091505b50915091508161023d576015610252565b808060200190518101906102519190610fb1565b5b60030b92505050949350505050565b5f8261027657680446f51bf84a520000610298565b7ffffffffffffffffffffffffffffffffffffffffffffffffbb90ae407b5ae00005b90505f8061016773ffffffffffffffffffffffffffffffffffffffff1663e0f4059a60e01b8585896040516024016102d2939291906110fa565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161033c9190610f65565b5f604051808303815f865af19150503d805f8114610375576040519150601f19603f3d011682016040523d82523d5f602084013e61037a565b606091505b509150915081610388575f80fd5b505050505050565b5f60605f8061016773ffffffffffffffffffffffffffffffffffffffff1663618dc65e60e01b87876040516024016103c9929190611136565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104339190610f65565b5f604051808303815f865af19150503d805f811461046c576040519150601f19603f3d011682016040523d82523d5f602084013e610471565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516104a7929190611173565b60405180910390a1816104ca57601560405180602001604052805f8152506104ce565b6016815b8160030b9150809450819550505050509250929050565b5f805f6104f6858560070b8861075a565b925092509250601660030b8314610542576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610539906111fb565b60405180910390fd5b505050505050565b5f8061016773ffffffffffffffffffffffffffffffffffffffff1663e0f4059a60e01b6305f4893f858760405160240161058693929190611228565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105f09190610f65565b5f604051808303815f865af19150503d805f8114610629576040519150601f19603f3d011682016040523d82523d5f602084013e61062e565b606091505b50915091508161063c575f80fd5b50505050565b5f805f61016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b8888888860405160240161067d9493929190610ee8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106e79190610f65565b5f604051808303815f865af19150503d805f8114610720576040519150601f19603f3d011682016040523d82523d5f602084013e610725565b606091505b50915091508161073657601561074b565b8080602001905181019061074a9190610fb1565b5b60030b92505050949350505050565b5f8060605f8061016773ffffffffffffffffffffffffffffffffffffffff1663e0f4059a60e01b89898960405160240161079693929190611264565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108009190610f65565b5f604051808303815f865af19150503d805f8114610839576040519150601f19603f3d011682016040523d82523d5f602084013e61083e565b606091505b5091509150816108995760155f8067ffffffffffffffff81111561086557610864610a15565b5b6040519080825280602002602001820160405280156108935781602001602082028036833780820191505090505b506108ae565b808060200190518101906108ad91906113b1565b5b8260030b9250809550819650829750505050505093509350939050565b5f604051905090565b5f80fd5b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f610905826108dc565b9050919050565b610915816108fb565b811461091f575f80fd5b50565b5f813590506109308161090c565b92915050565b5f819050919050565b61094881610936565b8114610952575f80fd5b50565b5f813590506109638161093f565b92915050565b5f805f8060808587031215610981576109806108d4565b5b5f61098e87828801610922565b945050602061099f87828801610922565b93505060406109b087828801610922565b92505060606109c187828801610955565b91505092959194509250565b5f8160070b9050919050565b6109e2816109cd565b82525050565b5f6020820190506109fb5f8301846109d9565b92915050565b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b610a4b82610a05565b810181811067ffffffffffffffff82111715610a6a57610a69610a15565b5b80604052505050565b5f610a7c6108cb565b9050610a888282610a42565b919050565b5f67ffffffffffffffff821115610aa757610aa6610a15565b5b602082029050602081019050919050565b5f80fd5b5f80fd5b5f67ffffffffffffffff821115610ada57610ad9610a15565b5b610ae382610a05565b9050602081019050919050565b828183375f83830152505050565b5f610b10610b0b84610ac0565b610a73565b905082815260208101848484011115610b2c57610b2b610abc565b5b610b37848285610af0565b509392505050565b5f82601f830112610b5357610b52610a01565b5b8135610b63848260208601610afe565b91505092915050565b5f610b7e610b7984610a8d565b610a73565b90508083825260208201905060208402830185811115610ba157610ba0610ab8565b5b835b81811015610be857803567ffffffffffffffff811115610bc657610bc5610a01565b5b808601610bd38982610b3f565b85526020850194505050602081019050610ba3565b5050509392505050565b5f82601f830112610c0657610c05610a01565b5b8135610c16848260208601610b6c565b91505092915050565b5f8115159050919050565b610c3381610c1f565b8114610c3d575f80fd5b50565b5f81359050610c4e81610c2a565b92915050565b5f805f60608486031215610c6b57610c6a6108d4565b5b5f84013567ffffffffffffffff811115610c8857610c876108d8565b5b610c9486828701610bf2565b9350506020610ca586828701610c40565b9250506040610cb686828701610922565b9150509250925092565b5f8060408385031215610cd657610cd56108d4565b5b5f610ce385828601610922565b925050602083013567ffffffffffffffff811115610d0457610d036108d8565b5b610d1085828601610b3f565b9150509250929050565b5f819050919050565b610d2c81610d1a565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f5b83811015610d69578082015181840152602081019050610d4e565b5f8484015250505050565b5f610d7e82610d32565b610d888185610d3c565b9350610d98818560208601610d4c565b610da181610a05565b840191505092915050565b5f604082019050610dbf5f830185610d23565b8181036020830152610dd18184610d74565b90509392505050565b610de3816109cd565b8114610ded575f80fd5b50565b5f81359050610dfe81610dda565b92915050565b5f805f60608486031215610e1b57610e1a6108d4565b5b5f84013567ffffffffffffffff811115610e3857610e376108d8565b5b610e4486828701610bf2565b9350506020610e5586828701610922565b9250506040610e6686828701610df0565b9150509250925092565b5f8060408385031215610e8657610e856108d4565b5b5f83013567ffffffffffffffff811115610ea357610ea26108d8565b5b610eaf85828601610bf2565b9250506020610ec085828601610df0565b9150509250929050565b610ed3816108fb565b82525050565b610ee281610936565b82525050565b5f608082019050610efb5f830187610eca565b610f086020830186610eca565b610f156040830185610eca565b610f226060830184610ed9565b95945050505050565b5f81905092915050565b5f610f3f82610d32565b610f498185610f2b565b9350610f59818560208601610d4c565b80840191505092915050565b5f610f708284610f35565b915081905092915050565b5f8160030b9050919050565b610f9081610f7b565b8114610f9a575f80fd5b50565b5f81519050610fab81610f87565b92915050565b5f60208284031215610fc657610fc56108d4565b5b5f610fd384828501610f9d565b91505092915050565b5f81600f0b9050919050565b610ff181610fdc565b82525050565b5f81519050919050565b5f82825260208201905092915050565b5f819050602082019050919050565b5f82825260208201905092915050565b5f61103a82610d32565b6110448185611020565b9350611054818560208601610d4c565b61105d81610a05565b840191505092915050565b5f6110738383611030565b905092915050565b5f602082019050919050565b5f61109182610ff7565b61109b8185611001565b9350836020820285016110ad85611011565b805f5b858110156110e857848403895281516110c98582611068565b94506110d48361107b565b925060208a019950506001810190506110b0565b50829750879550505050505092915050565b5f60608201905061110d5f830186610eca565b61111a6020830185610fe8565b818103604083015261112c8184611087565b9050949350505050565b5f6040820190506111495f830185610eca565b818103602083015261115b8184610d74565b90509392505050565b61116d81610c1f565b82525050565b5f6040820190506111865f830185611164565b81810360208301526111988184610d74565b90509392505050565b5f82825260208201905092915050565b7f4661696c656420746f206d696e7420746f6b656e0000000000000000000000005f82015250565b5f6111e56014836111a1565b91506111f0826111b1565b602082019050919050565b5f6020820190508181035f830152611212816111d9565b9050919050565b61122281610f7b565b82525050565b5f60608201905061123b5f830186611219565b61124860208301856109d9565b818103604083015261125a8184611087565b9050949350505050565b5f6060820190506112775f830186610eca565b6112846020830185610d23565b81810360408301526112968184611087565b9050949350505050565b5f67ffffffffffffffff82169050919050565b6112bc816112a0565b81146112c6575f80fd5b50565b5f815190506112d7816112b3565b92915050565b5f67ffffffffffffffff8211156112f7576112f6610a15565b5b602082029050602081019050919050565b5f8151905061131681610dda565b92915050565b5f61132e611329846112dd565b610a73565b9050808382526020820190506020840283018581111561135157611350610ab8565b5b835b8181101561137a57806113668882611308565b845260208401935050602081019050611353565b5050509392505050565b5f82601f83011261139857611397610a01565b5b81516113a884826020860161131c565b91505092915050565b5f805f606084860312156113c8576113c76108d4565b5b5f6113d586828701610f9d565b93505060206113e6868287016112c9565b925050604084015167ffffffffffffffff811115611407576114066108d8565b5b61141386828701611384565b915050925092509256fea2646970667358221220715eb199a1a8614482e4d3e9ababbf121ae34b0eb5e4bb559bc2de2442f508ee64736f6c63430008180033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.json
deleted file mode 100644
index ac62414d1f22..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.json
+++ /dev/null
@@ -1,182 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "bool",
-        "name": "useNegative",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "mintExtremeValue",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "mintInvalidAddressType",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "mintToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "response",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.bin
deleted file mode 100644
index 1bd1a5b68fc6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6109cd806100936000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80637c41ad2c1161005b5780637c41ad2c146100db578063e18a006f14610100578063e6bd957214610113578063f4b211681461012657600080fd5b80630d543f5f1461008d5780631f227fc3146100a25780632194f6eb146100b55780636f51648f146100c8575b600080fd5b6100a061009b3660046108e4565b610139565b005b6100a06100b03660046108e4565b610231565b6100a06100c33660046108e4565b61031e565b6100a06100d63660046108e4565b610389565b6100ee6100e9366004610917565b610476565b60405190815260200160405180910390f35b6100a061010e3660046108e4565b61055a565b6100a06101213660046108e4565b610647565b6100a06101343660046108e4565b610711565b600080546040516001600160a01b03858116602483015284811660448301528392169060640160408051601f198184030181529181526020820180516001600160e01b0316634753b51b60e01b179052516101949190610939565b600060405180830381855af49150503d80600081146101cf576040519150601f19603f3d011682016040523d82523d6000602084013e6101d4565b606091505b50915091508161022b5760405162461bcd60e51b815260206004820181905260248201527f44656c656761746520646973736f63696174652063616c6c206661696c65642160448201526064015b60405180910390fd5b50505050565b600080546040516001600160a01b03858116602483015284811660448301528392169060640160408051601f198184030181529181526020820180516001600160e01b0316634753b51b60e01b1790525161028c9190610939565b600060405180830381855afa9150503d80600081146102c7576040519150601f19603f3d011682016040523d82523d6000602084013e6102cc565b606091505b50915091508161022b5760405162461bcd60e51b815260206004820152601e60248201527f53746174696320646973736f63696174652063616c6c206661696c65642100006044820152606401610222565b6000546040516307f6314d60e41b81526001600160a01b038481166004830152838116602483015290911690637f6314d090604401600060405180830381600087803b15801561036d57600080fd5b505af1158015610381573d6000803e3d6000fd5b505050505050565b600080546040516001600160a01b03858116602483015284811660448301528392169060640160408051601f198184030181529181526020820180516001600160e01b03166307f6314d60e41b179052516103e49190610939565b600060405180830381855afa9150503d806000811461041f576040519150601f19603f3d011682016040523d82523d6000602084013e610424565b606091505b50915091508161022b5760405162461bcd60e51b815260206004820152601d60248201527f537461746963206173736f63696174652063616c6c206661696c6564210000006044820152606401610222565b604080516001600160a01b03831660248083019190915282518083039091018152604490910182526020810180516001600160e01b03167f7c41ad2c00000000000000000000000000000000000000000000000000000000179052905160009182918291610167916104e89190610939565b6000604051808303816000865af19150503d8060008114610525576040519150601f19603f3d011682016040523d82523d6000602084013e61052a565b606091505b50915091508161053b57601561054f565b8080602001905181019061054f9190610974565b60030b949350505050565b600080546040516001600160a01b03858116602483015284811660448301528392169060640160408051601f198184030181529181526020820180516001600160e01b03166307f6314d60e41b179052516105b59190610939565b600060405180830381855af49150503d80600081146105f0576040519150601f19603f3d011682016040523d82523d6000602084013e6105f5565b606091505b50915091508161022b5760405162461bcd60e51b815260206004820152601f60248201527f44656c6567617465206173736f63696174652063616c6c206661696c656421006044820152606401610222565b600061065383836107db565b9050601681146106a55760405162461bcd60e51b815260206004820152601160248201527f446973736f6369617465204661696c65640000000000000000000000000000006044820152606401610222565b6000546040516307f6314d60e41b81526001600160a01b038581166004830152848116602483015290911690637f6314d090604401600060405180830381600087803b1580156106f457600080fd5b505af1158015610708573d6000803e3d6000fd5b50505050505050565b6000546040516307f6314d60e41b81526001600160a01b038481166004830152838116602483015290911690637f6314d090604401600060405180830381600087803b15801561076057600080fd5b505af1158015610774573d6000803e3d6000fd5b50505050600061078483836107db565b9050601681146107d65760405162461bcd60e51b815260206004820152601160248201527f446973736f6369617465204661696c65640000000000000000000000000000006044820152606401610222565b505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b03167f099794e800000000000000000000000000000000000000000000000000000000179052905160009182918291610167916108559190610939565b6000604051808303816000865af19150503d8060008114610892576040519150601f19603f3d011682016040523d82523d6000602084013e610897565b606091505b5091509150816108a85760156108bc565b808060200190518101906108bc9190610974565b60030b95945050505050565b80356001600160a01b03811681146108df57600080fd5b919050565b600080604083850312156108f757600080fd5b610900836108c8565b915061090e602084016108c8565b90509250929050565b60006020828403121561092957600080fd5b610932826108c8565b9392505050565b6000825160005b8181101561095a5760208186018101518583015201610940565b81811115610969576000828501525b509190910192915050565b60006020828403121561098657600080fd5b81518060030b811461093257600080fdfea264697066735822122057db8e6eb936b95311e9245edf7471e4d65a99a6474895369462f9898b103cfb64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.json
deleted file mode 100644
index afd25b10aaeb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.json
+++ /dev/null
@@ -1,158 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "associateDissociateContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "associateDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "associateDissociateContractCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "associateInternalContractCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "associateStaticCall",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateAssociateContractCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateDelegateCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "dissociateStaticCall",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.bin
deleted file mode 100644
index cb4e7307987e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610b2f380380610b2f833981810160405281019061003291906100db565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610108565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a88261007d565b9050919050565b6100b88161009d565b81146100c357600080fd5b50565b6000815190506100d5816100af565b92915050565b6000602082840312156100f1576100f0610078565b5b60006100ff848285016100c6565b91505092915050565b610a18806101176000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806361324f2d1461003b5780637c41ad2c14610057575b600080fd5b610055600480360381019061005091906105f4565b610087565b005b610071600480360381019061006c9190610663565b610173565b60405161007e91906106a9565b60405180910390f35b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e7b5866d84846040518363ffffffff1660e01b81526004016100e29291906106e2565b600060405180830381600087803b1580156100fc57600080fd5b505af1158015610110573d6000803e3d6000fd5b50505050600080610122848685610288565b91509150601660030b821461016c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016390610768565b60405180910390fd5b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016101aa9190610788565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102149190610814565b6000604051808303816000865af19150503d8060008114610251576040519150601f19603f3d011682016040523d82523d6000602084013e610256565b606091505b50915091508161026757601561027c565b8080602001905181019061027b9190610864565b5b60030b92505050919050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b8888886040516024016102c49392919061094f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161032e9190610814565b6000604051808303816000865af19150503d806000811461036b576040519150601f19603f3d011682016040523d82523d6000602084013e610370565b606091505b5091509150816103835760156000610398565b8080602001905181019061039791906109a2565b5b8160030b915080945081955050505050935093915050565b6000604051905090565b600080fd5b600080fd5b600067ffffffffffffffff82169050919050565b6103e1816103c4565b81146103ec57600080fd5b50565b6000813590506103fe816103d8565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061042f82610404565b9050919050565b61043f81610424565b811461044a57600080fd5b50565b60008135905061045c81610436565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6104b082610467565b810181811067ffffffffffffffff821117156104cf576104ce610478565b5b80604052505050565b60006104e26103b0565b90506104ee82826104a7565b919050565b600067ffffffffffffffff82111561050e5761050d610478565b5b602082029050602081019050919050565b600080fd5b60008160070b9050919050565b61053a81610524565b811461054557600080fd5b50565b60008135905061055781610531565b92915050565b600061057061056b846104f3565b6104d8565b905080838252602082019050602084028301858111156105935761059261051f565b5b835b818110156105bc57806105a88882610548565b845260208401935050602081019050610595565b5050509392505050565b600082601f8301126105db576105da610462565b5b81356105eb84826020860161055d565b91505092915050565b60008060006060848603121561060d5761060c6103ba565b5b600061061b868287016103ef565b935050602061062c8682870161044d565b925050604084013567ffffffffffffffff81111561064d5761064c6103bf565b5b610659868287016105c6565b9150509250925092565b600060208284031215610679576106786103ba565b5b60006106878482850161044d565b91505092915050565b6000819050919050565b6106a381610690565b82525050565b60006020820190506106be600083018461069a565b92915050565b6106cd816103c4565b82525050565b6106dc81610424565b82525050565b60006040820190506106f760008301856106c4565b61070460208301846106d3565b9392505050565b600082825260208201905092915050565b7f546f6b656e206275726e206661696c6564000000000000000000000000000000600082015250565b600061075260118361070b565b915061075d8261071c565b602082019050919050565b6000602082019050818103600083015261078181610745565b9050919050565b600060208201905061079d60008301846106d3565b92915050565b600081519050919050565b600081905092915050565b60005b838110156107d75780820151818401526020810190506107bc565b60008484015250505050565b60006107ee826107a3565b6107f881856107ae565b93506108088185602086016107b9565b80840191505092915050565b600061082082846107e3565b915081905092915050565b60008160030b9050919050565b6108418161082b565b811461084c57600080fd5b50565b60008151905061085e81610838565b92915050565b60006020828403121561087a576108796103ba565b5b60006108888482850161084f565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6108c681610524565b82525050565b60006108d883836108bd565b60208301905092915050565b6000602082019050919050565b60006108fc82610891565b610906818561089c565b9350610911836108ad565b8060005b8381101561094257815161092988826108cc565b9750610934836108e4565b925050600181019050610915565b5085935050505092915050565b600060608201905061096460008301866106d3565b61097160208301856106c4565b818103604083015261098381846108f1565b9050949350505050565b60008151905061099c816103d8565b92915050565b600080604083850312156109b9576109b86103ba565b5b60006109c78582860161084f565b92505060206109d88582860161098d565b915050925092905056fea264697066735822122002d2f9e816d6063f9055d93d962f5de2308c938632bf725b00799e7eebb3c8c564736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.json
deleted file mode 100644
index 8281171e0ad3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_mintTokenContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnAfterNestedMint",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.bin
deleted file mode 100644
index eb754fc5c2dd..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50600060405161001f90610091565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090507f7b4b5576882318f3025ede3b4525a692b9a9792674c6bd0f82ce62845374a92181604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a15061009e565b610146806102ed83390190565b610240806100ad6000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063374d515114610030575b600080fd5b61003861003a565b005b6000604051610048906100b7565b604051809103906000f080158015610064573d6000803e3d6000fd5b5090507f7b4b5576882318f3025ede3b4525a692b9a9792674c6bd0f82ce62845374a92181604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a150565b610146806100c58339019056fe608060405234801561001057600080fd5b50600060405161001f90610091565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090507f48ae19c127155d0a34d60883afea3f9f59858f47d15a02c4aa437d1ff76f5d6f81604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a15061009d565b605c806100ea83390190565b603f806100ab6000396000f3fe6080604052600080fdfea26469706673582212209472d67a0ccca9dfa7248e052f38946db7baa5c69f329ac08844ac6b90b3dc3164736f6c634300070600336080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122080d194a5905c6420a2a58e45fde4e2e74264ea45c22c532caa5cd0645f0f846464736f6c63430007060033a264697066735822122067f71d5e7508b0a185d394eb6bafbcd4e2af9c318e1aa4703009cc5f8ac8e09a64736f6c63430007060033608060405234801561001057600080fd5b50600060405161001f90610091565b604051809103906000f08015801561003b573d6000803e3d6000fd5b5090507f48ae19c127155d0a34d60883afea3f9f59858f47d15a02c4aa437d1ff76f5d6f81604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390a15061009d565b605c806100ea83390190565b603f806100ab6000396000f3fe6080604052600080fdfea26469706673582212209472d67a0ccca9dfa7248e052f38946db7baa5c69f329ac08844ac6b90b3dc3164736f6c634300070600336080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea264697066735822122080d194a5905c6420a2a58e45fde4e2e74264ea45c22c532caa5cd0645f0f846464736f6c63430007060033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.json
deleted file mode 100644
index e994c3fbc9d1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "ChildCreated",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "callCreate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.bin
deleted file mode 100644
index 05cf7de723bc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610683806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c546091214610030575b600080fd5b61003861003a565b005b60405161004690610124565b604051809103906000f080158015610062573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663c54609126040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561010a57600080fd5b505af115801561011e573d6000803e3d6000fd5b50505050565b61051c806101328339019056fe608060405234801561001057600080fd5b506104fc806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c546091214610030575b600080fd5b61003861003a565b005b60405161004690610161565b604051809103906000f080158015610062573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16633cd4ef8a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561010a57600080fd5b505af192505050801561011b575060015b61015e5761012761017b565b806308c379a0141561014d575061013c610218565b80610147575061014f565b50610159565b505b3d6000803e3d6000fd5b61015f565b5b565b610218806102af83390190565b60008160e01c9050919050565b600060033d111561019a5760046000803e61019760005161016e565b90505b90565b6000604051905090565b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6101f0826101a7565b810181811067ffffffffffffffff8211171561020f5761020e6101b8565b5b80604052505050565b600060443d1015610228576102ab565b61023061019d565b60043d036004823e80513d602482011167ffffffffffffffff821117156102585750506102ab565b808201805167ffffffffffffffff81111561027657505050506102ab565b80602083010160043d0385018111156102935750505050506102ab565b6102a2826020018501866101e7565b82955050505050505b9056fe608060405234801561001057600080fd5b506101f8806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80633cd4ef8a14610030575b600080fd5b61003861003a565b005b604051610046906100dd565b604051809103906000f080158015610062573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100d490610146565b60405180910390fd5b605c8061016783390190565b600082825260208201905092915050565b7f4e4f504500000000000000000000000000000000000000000000000000000000600082015250565b60006101306004836100e9565b915061013b826100fa565b602082019050919050565b6000602082019050818103600083015261015f81610123565b905091905056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220f673a8cdec800d6367311b563852307507885721617efa330224a5a8fa09013264736f6c634300080c0033a26469706673582212207ecdeedb8ad7d192846b3944e0e5757ac6c046beb673d6db695ec96ae093fb1964736f6c634300080c0033a26469706673582212203e8a4fb56fee18c00d9035d654ca0391b9626a160fa8b2f58b42b8415d928f2064736f6c634300080c0033a2646970667358221220f488e712c9d5c75957dd8e9b49c5bce557e95cbee85fccdb3fe357c91a3b73aa64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.json
deleted file mode 100644
index 729ec34a93d5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "propagate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.bin
deleted file mode 100644
index b6796cef8732..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212201f6f37a54f0d3b64a5048247462b8ff9892ea9222d5db20ad544ecae65561dba64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.bin
deleted file mode 100644
index a568c49ab568..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061069a806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80637c41ad2c1461003b578063a50b36a51461006b575b600080fd5b6100556004803603810190610050919061037a565b610087565b60405161006291906103c0565b60405180910390f35b61008560048036038101906100809190610414565b61019c565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100be919061048a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101289190610516565b6000604051808303816000865af19150503d8060008114610165576040519150601f19603f3d011682016040523d82523d6000602084013e61016a565b606091505b50915091508161017b576015610190565b8080602001905181019061018f9190610566565b5b60030b92505050919050565b60006101aa858585856101f9565b9050601660030b81146101f2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101e9906105f0565b60405180910390fd5b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b88888888604051602401610236949392919061061f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102a09190610516565b6000604051808303816000865af19150503d80600081146102dd576040519150601f19603f3d011682016040523d82523d6000602084013e6102e2565b606091505b5091509150816102f3576015610308565b808060200190518101906103079190610566565b5b60030b92505050949350505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103478261031c565b9050919050565b6103578161033c565b811461036257600080fd5b50565b6000813590506103748161034e565b92915050565b6000602082840312156103905761038f610317565b5b600061039e84828501610365565b91505092915050565b6000819050919050565b6103ba816103a7565b82525050565b60006020820190506103d560008301846103b1565b92915050565b60008160070b9050919050565b6103f1816103db565b81146103fc57600080fd5b50565b60008135905061040e816103e8565b92915050565b6000806000806080858703121561042e5761042d610317565b5b600061043c87828801610365565b945050602061044d87828801610365565b935050604061045e87828801610365565b925050606061046f878288016103ff565b91505092959194509250565b6104848161033c565b82525050565b600060208201905061049f600083018461047b565b92915050565b600081519050919050565b600081905092915050565b60005b838110156104d95780820151818401526020810190506104be565b60008484015250505050565b60006104f0826104a5565b6104fa81856104b0565b935061050a8185602086016104bb565b80840191505092915050565b600061052282846104e5565b915081905092915050565b60008160030b9050919050565b6105438161052d565b811461054e57600080fd5b50565b6000815190506105608161053a565b92915050565b60006020828403121561057c5761057b610317565b5b600061058a84828501610551565b91505092915050565b600082825260208201905092915050565b7f5472616e73666572206f6620746f6b656e73206661696c656400000000000000600082015250565b60006105da601983610593565b91506105e5826105a4565b602082019050919050565b60006020820190508181036000830152610609816105cd565b9050919050565b610619816103db565b82525050565b6000608082019050610634600083018761047b565b610641602083018661047b565b61064e604083018561047b565b61065b6060830184610610565b9594505050505056fea26469706673582212200e636f9c92a927125ae1c4f0bccada39f97bb8cd28d2fd100e4573118dd2c2fe64736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.json
deleted file mode 100644
index 73f8dc857699..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "_amount",
-        "type": "int64"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.bin
deleted file mode 100644
index f6ae6d9d55cc..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161001d9061005f565b604051809103906000f080158015610039573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b039290921691909117905561006c565b6102618061148183390190565b6114068061007b6000396000f3fe6080604052600436106100a75760003560e01c80638f8d7f99116100645780638f8d7f99146101955780639f1cddfc146101b5578063aa3ed908146101c8578063af99c633146101db578063d614cdb8146101fb578063f2c31ff41461022957600080fd5b80632c523dd3146100ac5780633b3bff0f146100c15780633c4dd32e146100f4578063593d6e82146101225780636fc3cbaf146101425780637c41ad2c14610175575b600080fd5b6100bf6100ba366004610ab2565b610263565b005b3480156100cd57600080fd5b506100e16100dc366004610ab2565b610422565b6040519081526020015b60405180910390f35b34801561010057600080fd5b5061011461010f366004610ae6565b6104fc565b6040516100eb929190610bd9565b34801561012e57600080fd5b506100e161013d366004610cc5565b6105e3565b34801561014e57600080fd5b5061016261015d366004610df2565b6106c0565b60405160079190910b81526020016100eb565b34801561018157600080fd5b506100e1610190366004610ab2565b6106ec565b3480156101a157600080fd5b506101626101b0366004610f8f565b61071a565b6100bf6101c3366004610ab2565b610750565b6100bf6101d6366004610fc8565b6107b4565b3480156101e757600080fd5b506101626101f6366004610f8f565b61084c565b34801561020757600080fd5b5061021b610216366004610ab2565b610882565b6040516100eb929190611062565b34801561023557600080fd5b50610249610244366004610f8f565b61098c565b6040805160079390930b83529015156020830152016100eb565b6000546001600160a01b03166399047f0261027f60023461109c565b6040516001600160e01b031960e084901b1681526001600160a01b03851660048201526024016000604051808303818588803b1580156102be57600080fd5b505af11580156102d2573d6000803e3d6000fd5b50505050506000816001600160a01b03166004346102f0919061109c565b604051600081818185875af1925050503d806000811461032c576040519150601f19603f3d011682016040523d82523d6000602084013e610331565b606091505b505090508061037e5760405162461bcd60e51b81526020600482015260146024820152732330b4b632b2103a379039b2b7321022ba3432b960611b60448201526064015b60405180910390fd5b6001600160a01b03821661039360043461109c565b604051600081818185875af1925050503d80600081146103cf576040519150601f19603f3d011682016040523d82523d6000602084013e6103d4565b606091505b5050809150508061041e5760405162461bcd60e51b81526020600482015260146024820152732330b4b632b2103a379039b2b7321022ba3432b960611b6044820152606401610375565b5050565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161048a91906110be565b6000604051808303816000865af19150503d80600081146104c7576040519150601f19603f3d011682016040523d82523d6000602084013e6104cc565b606091505b5091509150816104dd5760156104f1565b808060200190518101906104f191906110ec565b60030b949350505050565b6000610506610a57565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b1790529051600091829161016791610560916110be565b6000604051808303816000865af19150503d806000811461059d576040519150601f19603f3d011682016040523d82523d6000602084013e6105a2565b606091505b50915091506105af610a57565b826105bc576015816105d0565b818060200190518101906105d09190611157565b60039190910b9890975095505050505050565b60008060006101676001600160a01b031663593d6e8260e01b868660405160240161060f929190611232565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161064d91906110be565b6000604051808303816000865af19150503d806000811461068a576040519150601f19603f3d011682016040523d82523d6000602084013e61068f565b606091505b5091509150816106a05760156106b4565b808060200190518101906106b491906110ec565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b868660405160240161060f929190611275565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b9060440161044c565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b9060640161060f565b600054604051632c165ac560e21b81526001600160a01b0383811660048301529091169063b0596b149034906024016000604051808303818588803b15801561079857600080fd5b505af11580156107ac573d6000803e3d6000fd5b505050505050565b805160005b81811015610847578281815181106107d3576107d36112fa565b60200260200101516001600160a01b031682346107f0919061109c565b604051600081818185875af1925050503d806000811461082c576040519150601f19603f3d011682016040523d82523d6000602084013e610831565b606091505b505050808061083f90611310565b9150506107b9565b505050565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b9060640161060f565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b1790529251909283918291610167916108f491906110be565b6000604051808303816000865af19150503d8060008114610931576040519150601f19603f3d011682016040523d82523d6000602084013e610936565b606091505b5060408051606081018252600080825260208201819052918101919091529193509150826109665760158161097a565b8180602001905181019061097a9190611339565b60039190910b97909650945050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b1790529051600091829182918291610167916109ee916110be565b6000604051808303816000865af19150503d8060008114610a2b576040519150601f19603f3d011682016040523d82523d6000602084013e610a30565b606091505b509150915081610a43576015600061097a565b8080602001905181019061097a91906113a4565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001600160a01b0381168114610aaf57600080fd5b50565b600060208284031215610ac457600080fd5b8135610acf81610a9a565b9392505050565b8035610ae181610a9a565b919050565b60008060408385031215610af957600080fd5b8235610b0481610a9a565b946020939093013593505050565b60005b83811015610b2d578181015183820152602001610b15565b83811115610b3c576000848401525b50505050565b60008151808452610b5a816020860160208601610b12565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a06040860152610ba660a0860183610b42565b915060608401518583036060870152610bbf8382610b42565b925050806080850151166080860152508091505092915050565b8260070b8152604060208201526000610bf56040830184610b6e565b949350505050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff81118282101715610c3657610c36610bfd565b60405290565b6040805190810167ffffffffffffffff81118282101715610c3657610c36610bfd565b60405160a0810167ffffffffffffffff81118282101715610c3657610c36610bfd565b604051601f8201601f1916810167ffffffffffffffff81118282101715610cab57610cab610bfd565b604052919050565b63ffffffff81168114610aaf57600080fd5b6000808284036080811215610cd957600080fd5b8335610ce481610a9a565b92506060601f1982011215610cf857600080fd5b50610d01610c13565b6020840135610d0f81610cb3565b81526040840135610d1f81610a9a565b60208201526060840135610d3281610cb3565b6040820152919491935090915050565b600067ffffffffffffffff821115610d5c57610d5c610bfd565b5060051b60200190565b8015158114610aaf57600080fd5b600067ffffffffffffffff821115610d8e57610d8e610bfd565b50601f01601f191660200190565b600082601f830112610dad57600080fd5b8135610dc0610dbb82610d74565b610c82565b818152846020838601011115610dd557600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610e0557600080fd5b610e0f8335610a9a565b82359150602083013567ffffffffffffffff80821115610e2e57600080fd5b818501915085601f830112610e4257600080fd5b610e4f610dbb8335610d42565b82358082526020808301929160051b85010188811115610e6e57600080fd5b602085015b81811015610f80578481351115610e8957600080fd5b80358601601f196040828d0382011215610ea257600080fd5b610eaa610c3c565b60208301358152604083013588811115610ec357600080fd5b929092019160a0838e0383011215610eda57600080fd5b610ee2610c5f565b91506020830135610ef281610d66565b82526040830135610f0281610a9a565b6020830152606083013588811115610f1957600080fd5b610f288e602083870101610d9c565b604084015250608083013588811115610f4057600080fd5b610f4f8e602083870101610d9c565b606084015250610f6160a08401610ad6565b6080830152602081810192909252865294850194919091019050610e73565b50959890975095505050505050565b60008060408385031215610fa257600080fd5b8235610fad81610a9a565b91506020830135610fbd81610a9a565b809150509250929050565b60006020808385031215610fdb57600080fd5b823567ffffffffffffffff811115610ff257600080fd5b8301601f8101851361100357600080fd5b8035611011610dbb82610d42565b81815260059190911b8201830190838101908783111561103057600080fd5b928401925b8284101561105757833561104881610a9a565b82529284019290840190611035565b979650505050505050565b82815260808101610acf6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b6000826110b957634e487b7160e01b600052601260045260246000fd5b500490565b600082516110d0818460208701610b12565b9190910192915050565b8051600381900b8114610ae157600080fd5b6000602082840312156110fe57600080fd5b610acf826110da565b8051610ae181610a9a565b600082601f83011261112357600080fd5b8151611131610dbb82610d74565b81815284602083860101111561114657600080fd5b610bf5826020830160208701610b12565b6000806040838503121561116a57600080fd5b611173836110da565b9150602083015167ffffffffffffffff8082111561119057600080fd5b9084019060a082870312156111a457600080fd5b6111ac610c5f565b82516111b781610d66565b815260208301516111c781610a9a565b60208201526040830151828111156111de57600080fd5b6111ea88828601611112565b60408301525060608301518281111561120257600080fd5b61120e88828601611112565b60608301525061122060808401611107565b60808201528093505050509250929050565b6001600160a01b038316815260808101610acf6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b828110156112eb57888603605f190184528151805187528501518587018890526112d888880182610b6e565b96505092840192908401906001016112ac565b50939998505050505050505050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561133257634e487b7160e01b600052601160045260246000fd5b5060010190565b600080828403608081121561134d57600080fd5b611356846110da565b92506060601f198201121561136a57600080fd5b50611373610c13565b602084015161138181610cb3565b8152604084015161139181610a9a565b60208201526060840151610d3281610cb3565b600080604083850312156113b757600080fd5b6113c0836110da565b91506020830151610fbd81610d6656fea26469706673582212207435d0e6b25239cdb110932d182b35dcd72565d4edc952e5510e3324567b838564736f6c634300080b0033608060405234801561001057600080fd5b50610241806100206000396000f3fe6080604052600436106100295760003560e01c806399047f021461002e578063b0596b1414610043575b600080fd5b61004161003c3660046101db565b610056565b005b6100416100513660046101db565b6100f9565b6000816001600160a01b03163460405160006040518083038185875af1925050503d80600081146100a3576040519150601f19603f3d011682016040523d82523d6000602084013e6100a8565b606091505b50509050806100f55760405162461bcd60e51b81526020600482015260146024820152732330b4b632b2103a379039b2b7321022ba3432b960611b60448201526064015b60405180910390fd5b5050565b6000816001600160a01b03163460405160006040518083038185875af1925050503d8060008114610146576040519150601f19603f3d011682016040523d82523d6000602084013e61014b565b606091505b50509050806101935760405162461bcd60e51b81526020600482015260146024820152732330b4b632b2103a379039b2b7321022ba3432b960611b60448201526064016100ec565b60405162461bcd60e51b815260206004820152601860248201527f536f7272792c206e6f7420676f6e6e612068617070656e21000000000000000060448201526064016100ec565b6000602082840312156101ed57600080fd5b81356001600160a01b038116811461020457600080fd5b939250505056fea2646970667358221220887447e0f30c5ca0dac71367b4e2e1271a08775a447ad6fb03c8a22ee29d43de64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.json
deleted file mode 100644
index 905067ca6249..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.json
+++ /dev/null
@@ -1,362 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "_addresses",
-        "type": "address[]"
-      }
-    ],
-    "name": "createTooManyHollowAccounts",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "nestedLazyCreateThenRevert",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_to",
-        "type": "address"
-      }
-    ],
-    "name": "nestedLazyCreateThenSendMore",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.bin
deleted file mode 100644
index 50ae2fe59776..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260405161026038038061026083398181016040528101906100259190610132565b5f8173ffffffffffffffffffffffffffffffffffffffff163460405161004a9061018a565b5f6040518083038185875af1925050503d805f8114610084576040519150601f19603f3d011682016040523d82523d5f602084013e610089565b606091505b50509050806100cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100c4906101f8565b60405180910390fd5b5050610216565b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f610101826100d8565b9050919050565b610111816100f7565b811461011b575f80fd5b50565b5f8151905061012c81610108565b92915050565b5f60208284031215610147576101466100d4565b5b5f6101548482850161011e565b91505092915050565b5f81905092915050565b50565b5f6101755f8361015d565b915061018082610167565b5f82019050919050565b5f6101948261016a565b9150819050919050565b5f82825260208201905092915050565b7f4661696c656420746f2073656e642076616c75650000000000000000000000005f82015250565b5f6101e260148361019e565b91506101ed826101ae565b602082019050919050565b5f6020820190508181035f83015261020f816101d6565b9050919050565b603e806102225f395ff3fe60806040525f80fdfea26469706673582212200c7885fbe2cfcafc72ca84b8d647e3fb3525c13b23b71fb475e80a6fa63c193664736f6c63430008150033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.json
deleted file mode 100644
index fd8f2ceb3ace..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_address",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "payable",
-      "type": "constructor"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.bin
deleted file mode 100644
index 2e849ae94af5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b50604051620010a9380380620010a983398181016040528101906200003791906200012a565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505062000171565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620000f282620000c5565b9050919050565b6200010481620000e5565b81146200011057600080fd5b50565b6000815190506200012481620000f9565b92915050565b60008060408385031215620001445762000143620000c0565b5b6000620001548582860162000113565b9250506020620001678582860162000113565b9150509250929050565b610f2880620001816000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80637c41ad2c1461004657806396d1705914610076578063e5ef305d14610092575b600080fd5b610060600480360381019061005b9190610793565b6100ae565b60405161006d91906107d9565b60405180910390f35b610090600480360381019061008b9190610a59565b6101c3565b005b6100ac60048036038101906100a79190610adc565b61036a565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016100e59190610b47565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161014f9190610bd3565b6000604051808303816000865af19150503d806000811461018c576040519150601f19603f3d011682016040523d82523d6000602084013e610191565b606091505b5091509150816101a25760156101b7565b808060200190518101906101b69190610c23565b5b60030b92505050919050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166381f71ab660e01b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168660405160240161023a929190610d5c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102a49190610bd3565b600060405180830381855af49150503d80600081146102df576040519150601f19603f3d011682016040523d82523d6000602084013e6102e4565b606091505b50915091506000610319600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff168888876104eb565b9050601660030b8114610361576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161035890610de9565b60405180910390fd5b50505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166381f71ab660e01b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016103e1929190610d5c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161044b9190610bd3565b600060405180830381855af49150503d8060008114610486576040519150601f19603f3d011682016040523d82523d6000602084013e61048b565b606091505b5091509150600061049c8586610609565b9050601660030b81146104e4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104db90610e55565b60405180910390fd5b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016105289493929190610e84565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105929190610bd3565b6000604051808303816000865af19150503d80600081146105cf576040519150601f19603f3d011682016040523d82523d6000602084013e6105d4565b606091505b5091509150816105e55760156105fa565b808060200190518101906105f99190610c23565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401610642929190610ec9565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106ac9190610bd3565b6000604051808303816000865af19150503d80600081146106e9576040519150601f19603f3d011682016040523d82523d6000602084013e6106ee565b606091505b5091509150816106ff576015610714565b808060200190518101906107139190610c23565b5b60030b9250505092915050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061076082610735565b9050919050565b61077081610755565b811461077b57600080fd5b50565b60008135905061078d81610767565b92915050565b6000602082840312156107a9576107a861072b565b5b60006107b78482850161077e565b91505092915050565b6000819050919050565b6107d3816107c0565b82525050565b60006020820190506107ee60008301846107ca565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610842826107f9565b810181811067ffffffffffffffff821117156108615761086061080a565b5b80604052505050565b6000610874610721565b90506108808282610839565b919050565b600067ffffffffffffffff8211156108a05761089f61080a565b5b602082029050602081019050919050565b600080fd5b600080fd5b600067ffffffffffffffff8211156108d6576108d561080a565b5b6108df826107f9565b9050602081019050919050565b82818337600083830152505050565b600061090e610909846108bb565b61086a565b90508281526020810184848401111561092a576109296108b6565b5b6109358482856108ec565b509392505050565b600082601f830112610952576109516107f4565b5b81356109628482602086016108fb565b91505092915050565b600061097e61097984610885565b61086a565b905080838252602082019050602084028301858111156109a1576109a06108b1565b5b835b818110156109e857803567ffffffffffffffff8111156109c6576109c56107f4565b5b8086016109d3898261093d565b855260208501945050506020810190506109a3565b5050509392505050565b600082601f830112610a0757610a066107f4565b5b8135610a1784826020860161096b565b91505092915050565b60008160070b9050919050565b610a3681610a20565b8114610a4157600080fd5b50565b600081359050610a5381610a2d565b92915050565b60008060008060808587031215610a7357610a7261072b565b5b6000610a818782880161077e565b9450506020610a928782880161077e565b935050604085013567ffffffffffffffff811115610ab357610ab2610730565b5b610abf878288016109f2565b9250506060610ad087828801610a44565b91505092959194509250565b60008060408385031215610af357610af261072b565b5b6000610b018582860161077e565b925050602083013567ffffffffffffffff811115610b2257610b21610730565b5b610b2e858286016109f2565b9150509250929050565b610b4181610755565b82525050565b6000602082019050610b5c6000830184610b38565b92915050565b600081519050919050565b600081905092915050565b60005b83811015610b96578082015181840152602081019050610b7b565b60008484015250505050565b6000610bad82610b62565b610bb78185610b6d565b9350610bc7818560208601610b78565b80840191505092915050565b6000610bdf8284610ba2565b915081905092915050565b60008160030b9050919050565b610c0081610bea565b8114610c0b57600080fd5b50565b600081519050610c1d81610bf7565b92915050565b600060208284031215610c3957610c3861072b565b5b6000610c4784828501610c0e565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b6000610c9882610b62565b610ca28185610c7c565b9350610cb2818560208601610b78565b610cbb816107f9565b840191505092915050565b6000610cd28383610c8d565b905092915050565b6000602082019050919050565b6000610cf282610c50565b610cfc8185610c5b565b935083602082028501610d0e85610c6c565b8060005b85811015610d4a5784840389528151610d2b8582610cc6565b9450610d3683610cda565b925060208a01995050600181019050610d12565b50829750879550505050505092915050565b6000604082019050610d716000830185610b38565b8181036020830152610d838184610ce7565b90509392505050565b600082825260208201905092915050565b7f4e6f6e2046756e6769626c65207472616e73666572206661696c656421000000600082015250565b6000610dd3601d83610d8c565b9150610dde82610d9d565b602082019050919050565b60006020820190508181036000830152610e0281610dc6565b9050919050565b7f4173736f6369617465206f66204e4654206661696c6564210000000000000000600082015250565b6000610e3f601883610d8c565b9150610e4a82610e09565b602082019050919050565b60006020820190508181036000830152610e6e81610e32565b9050919050565b610e7e81610a20565b82525050565b6000608082019050610e996000830187610b38565b610ea66020830186610b38565b610eb36040830185610b38565b610ec06060830184610e75565b95945050505050565b6000604082019050610ede6000830185610b38565b610eeb6020830184610b38565b939250505056fea26469706673582212202fc533406222af590894aa88f9970f94a5924ff04af01335e29a9c521012b50764736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.json
deleted file mode 100644
index 669f7d748134..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.json
+++ /dev/null
@@ -1,83 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_mintNFTContractAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "accountToAssociate",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "revertMintAfterFailedAssociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      }
-    ],
-    "name": "sendNFTAfterMint",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.bin
deleted file mode 100644
index 7ccbd7d0efd7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610171806100136000396000f3fe6080604052600436106100295760003560e01c80638dd980431461002b578063acef603714610059575b005b6100576004803603602081101561004157600080fd5b81019080803590602001909291905050506100a7565b005b6100a56004803603604081101561006f57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506100f1565b005b3373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156100ed573d6000803e3d6000fd5b5050565b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610137573d6000803e3d6000fd5b50505056fea265627a7a723158205eb40bb620835fb7969cdd75ded188927d5c927f93ba675d65b9c5234442428764736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.json
deleted file mode 100644
index 7844bb5444fa..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToAddress",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToCaller",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.bin
deleted file mode 100644
index e6bed077edd9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052604051610e6b380380610e6b8339818101604052604081101561002657600080fd5b810190808051906020019092919080519060200190929190505050816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050610d98806100d36000396000f3fe60806040526004361061003f5760003560e01c80635555d7e4146100415780635ecf298a146100cf5780639dc7db10146100fd578063a9a3a6351461014b575b005b6100cd6004803603608081101561005757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610179565b005b6100fb600480360360208110156100e557600080fd5b8101908080359060200190929190505050610713565b005b6101496004803603604081101561011357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061082f565b005b6101776004803603602081101561016157600080fd5b8101908080359060200190929190505050610a0f565b005b8373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156101bf573d6000803e3d6000fd5b506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef6037856002848161020857fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561027257600080fd5b505af1158015610286573d6000803e3d6000fd5b50505050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef603785600284816102d357fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561033d57600080fd5b505af1158015610351573d6000803e3d6000fd5b505050508273ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561039b573d6000803e3d6000fd5b506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef603784600284816103e457fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561044e57600080fd5b505af1158015610462573d6000803e3d6000fd5b50505050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef603784600284816104af57fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561051957600080fd5b505af115801561052d573d6000803e3d6000fd5b505050508173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610577573d6000803e3d6000fd5b506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef603783600284816105c057fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561062a57600080fd5b505af115801561063e573d6000803e3d6000fd5b50505050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef6037836002848161068b57fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b1580156106f557600080fd5b505af1158015610709573d6000803e3d6000fd5b5050505050505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16638dd98043826040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b15801561078757600080fd5b505af115801561079b573d6000803e3d6000fd5b50505050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16638dd98043826040518263ffffffff1660e01b815260040180828152602001915050600060405180830381600087803b15801561081457600080fd5b505af1158015610828573d6000803e3d6000fd5b5050505050565b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610875573d6000803e3d6000fd5b506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef603783600284816108be57fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561092857600080fd5b505af115801561093c573d6000803e3d6000fd5b50505050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663acef6037836002848161098957fe5b046040518363ffffffff1660e01b8152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b1580156109f357600080fd5b505af1158015610a07573d6000803e3d6000fd5b505050505050565b600060606000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1683604051602401808281526020019150506040516020818303038152906040527f8dd98043000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b60208310610b0c5780518252602082019150602081019050602083039250610ae9565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610b6c576040519150601f19603f3d011682016040523d82523d6000602084013e610b71565b606091505b509150915060006060600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1685604051602401808281526020019150506040516020818303038152906040527f8dd98043000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b60208310610c745780518252602082019150602081019050602083039250610c51565b6001836020036101000a038019825116818451168082178552505050505050905001915050600060405180830381855af49150503d8060008114610cd4576040519150601f19603f3d011682016040523d82523d6000602084013e610cd9565b606091505b5091509150831580610ce9575081155b15610d5c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f44656c6567617465207472616e736665722063616c6c206661696c656421000081525060200191505060405180910390fd5b505050505056fea265627a7a72315820619d55525cd17f739b0cb26d86f7d18f155eac45f95370d964dea3c70db14d6e64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.json
deleted file mode 100644
index b5e8378620ee..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.json
+++ /dev/null
@@ -1,104 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_nestedContract1",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_nestedContract2",
-        "type": "address"
-      }
-    ],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "receiver1",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "receiver2",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "receiver3",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromAndToDifferentAddresses",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromDifferentAddressesToAddress",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToCallerFromDifferentAddresses",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToContractFromDifferentAddresses",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.bin
deleted file mode 100644
index b92eae93dc96..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526040518060400160405280600981526020017f746f6b656e4e616d650000000000000000000000000000000000000000000000815250600290805190602001906200005192919062000371565b506040518060400160405280600b81526020017f746f6b656e53796d626f6c000000000000000000000000000000000000000000815250600390805190602001906200009f92919062000371565b506040518060400160405280600481526020017f6d656d6f0000000000000000000000000000000000000000000000000000000081525060049080519060200190620000ed92919062000371565b506103e8600560006101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506103e8600560086101000a81548167ffffffffffffffff021916908360070b67ffffffffffffffff1602179055506008600560106101000a81548163ffffffff021916908363ffffffff1602179055506000600560146101000a81548160ff0219169083151502179055503480156200019157600080fd5b506001806000806006811115620001ad57620001ac62000457565b5b6006811115620001c257620001c162000457565b5b81526020019081526020016000208190555060026001600060016006811115620001f157620001f062000457565b5b600681111562000206576200020562000457565b5b8152602001908152602001600020819055506004600160006002600681111562000235576200023462000457565b5b60068111156200024a576200024962000457565b5b8152602001908152602001600020819055506008600160006003600681111562000279576200027862000457565b5b60068111156200028e576200028d62000457565b5b81526020019081526020016000208190555060106001600060046006811115620002bd57620002bc62000457565b5b6006811115620002d257620002d162000457565b5b8152602001908152602001600020819055506020600160006005600681111562000301576200030062000457565b5b600681111562000316576200031562000457565b5b81526020019081526020016000208190555060406001600060068081111562000344576200034362000457565b5b600681111562000359576200035862000457565b5b815260200190815260200160002081905550620004b5565b8280546200037f9062000421565b90600052602060002090601f016020900481019282620003a35760008555620003ef565b82601f10620003be57805160ff1916838001178555620003ef565b82800160010185558215620003ef579182015b82811115620003ee578251825591602001919060010190620003d1565b5b509050620003fe919062000402565b5090565b5b808211156200041d57600081600090555060010162000403565b5090565b600060028204905060018216806200043a57607f821691505b6020821081141562000451576200045062000486565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6142ab80620004c56000396000f3fe6080604052600436106100a75760003560e01c80638070905f116100645780638070905f146101d85780638ba74da0146102175780639b23d3d914610233578063d85f74c114610270578063eac6f3fe1461028c578063f4a01e5b146102c9576100a7565b80630488c939146100ac5780630fd2601e146100c8578063118741e71461010557806311e1fc071461014257806315dacbea1461017f5780634b5c6687146101bc575b600080fd5b6100c660048036038101906100c19190612fe6565b610306565b005b3480156100d457600080fd5b506100ef60048036038101906100ea9190612fe6565b610910565b6040516100fc9190613ba1565b60405180910390f35b34801561011157600080fd5b5061012c6004803603810190610127919061308d565b61096e565b6040516101399190613b2d565b60405180910390f35b34801561014e57600080fd5b5061016960048036038101906101649190613026565b6109c9565b6040516101769190613ba1565b60405180910390f35b34801561018b57600080fd5b506101a660048036038101906101a19190613026565b610ae5565b6040516101b39190613ba1565b60405180910390f35b6101d660048036038101906101d19190612fb9565b610c03565b005b3480156101e457600080fd5b506101ff60048036038101906101fa91906130e9565b611071565b60405161020e93929190613b48565b60405180910390f35b610231600480360381019061022c9190612fe6565b611116565b005b34801561023f57600080fd5b5061025a60048036038101906102559190613026565b611677565b6040516102679190613ba1565b60405180910390f35b61028a60048036038101906102859190612fb9565b611795565b005b34801561029857600080fd5b506102b360048036038101906102ae9190613026565b611bd9565b6040516102c09190613ba1565b60405180910390f35b3480156102d557600080fd5b506102f060048036038101906102eb9190612fe6565b611cf5565b6040516102fd9190613b2d565b60405180910390f35b6000600567ffffffffffffffff81111561032357610322614192565b5b60405190808252806020026020018201604052801561035c57816020015b610349612b00565b8152602001906001900390816103415790505b50905061037d60006006600060405180602001604052806000815250611d50565b8160008151811061039157610390614163565b5b60200260200101819052506103b86001600060405180602001604052806000815250611d89565b816001815181106103cc576103cb614163565b5b60200260200101819052506103f36002600060405180602001604052806000815250611d89565b8160028151811061040757610406614163565b5b602002602001018190525061042e6004600060405180602001604052806000815250611d89565b8160038151811061044257610441614163565b5b60200260200101819052506104696003600060405180602001604052806000815250611d89565b8160048151811061047d5761047c614163565b5b602002602001018190525060006040518060600160405280600063ffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff168152602001627a120063ffffffff1681525090506000604051806101200160405280600280546104e8906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054610514906140a2565b80156105615780601f1061053657610100808354040283529160200191610561565b820191906000526020600020905b81548152906001019060200180831161054457829003601f168201915b5050505050815260200160038054610578906140a2565b80601f01602080910402602001604051908101604052809291908181526020018280546105a4906140a2565b80156105f15780601f106105c6576101008083540402835291602001916105f1565b820191906000526020600020905b8154815290600101906020018083116105d457829003601f168201915b505050505081526020018673ffffffffffffffffffffffffffffffffffffffff16815260200160048054610624906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054610650906140a2565b801561069d5780601f106106725761010080835404028352916020019161069d565b820191906000526020600020905b81548152906001019060200180831161068057829003601f168201915b50505050508152602001600115158152602001600560089054906101000a900460070b60070b8152602001600560149054906101000a900460ff16151581526020018481526020018381525090506000600167ffffffffffffffff81111561070857610707614192565b5b60405190808252806020026020018201604052801561074157816020015b61072e612b20565b8152602001906001900390816107265790505b5090506040518060a00160405280600163ffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020016000151581526020018773ffffffffffffffffffffffffffffffffffffffff16815250816000815181106107b8576107b7614163565b5b60200260200101819052506000600167ffffffffffffffff8111156107e0576107df614192565b5b60405190808252806020026020018201604052801561081957816020015b610806612b85565b8152602001906001900390816107fe5790505b5090506040518060c00160405280600463ffffffff168152602001600563ffffffff168152602001600a63ffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020018873ffffffffffffffffffffffffffffffffffffffff16815250816000815181106108a1576108a0614163565b5b60200260200101819052506000806108ba858585611dc0565b91509150601660030b82146108ce57600080fd5b7f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed816040516108fd9190613a36565b60405180910390a1505050505050505050565b600061091c8383611f3f565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8160405161094d9190613b86565b60405180910390a1601660030b8160070b1461096857600080fd5b92915050565b600061097a8383612057565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516109ab9190613b2d565b60405180910390a1601660030b81146109c357600080fd5b92915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b88888888604051602401610a069493929190613a7a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a709190613a1f565b600060405180830381855af49150503d8060008114610aab576040519150601f19603f3d011682016040523d82523d6000602084013e610ab0565b606091505b509150915081610ac1576015610ad6565b80806020019051810190610ad59190613158565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401610b229493929190613a7a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b8c9190613a1f565b6000604051808303816000865af19150503d8060008114610bc9576040519150601f19603f3d011682016040523d82523d6000602084013e610bce565b606091505b509150915081610bdf576015610bf4565b80806020019051810190610bf39190613158565b5b60030b92505050949350505050565b6000600567ffffffffffffffff811115610c2057610c1f614192565b5b604051908082528060200260200182016040528015610c5957816020015b610c46612b00565b815260200190600190039081610c3e5790505b509050610c7a60006006600060405180602001604052806000815250611d50565b81600081518110610c8e57610c8d614163565b5b6020026020010181905250610cb56001600060405180602001604052806000815250611d89565b81600181518110610cc957610cc8614163565b5b6020026020010181905250610cf06002600060405180602001604052806000815250611d89565b81600281518110610d0457610d03614163565b5b6020026020010181905250610d2b6003600060405180602001604052806000815250611d89565b81600381518110610d3f57610d3e614163565b5b6020026020010181905250610d666004600060405180602001604052806000815250611d89565b81600481518110610d7a57610d79614163565b5b602002602001018190525060006040518060600160405280600063ffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff168152602001627a120063ffffffff168152509050600060405180610120016040528060028054610de5906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054610e11906140a2565b8015610e5e5780601f10610e3357610100808354040283529160200191610e5e565b820191906000526020600020905b815481529060010190602001808311610e4157829003601f168201915b5050505050815260200160038054610e75906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054610ea1906140a2565b8015610eee5780601f10610ec357610100808354040283529160200191610eee565b820191906000526020600020905b815481529060010190602001808311610ed157829003601f168201915b505050505081526020018573ffffffffffffffffffffffffffffffffffffffff16815260200160048054610f21906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054610f4d906140a2565b8015610f9a5780601f10610f6f57610100808354040283529160200191610f9a565b820191906000526020600020905b815481529060010190602001808311610f7d57829003601f168201915b50505050508152602001600115158152602001600560089054906101000a900460070b60070b8152602001600560149054906101000a900460ff161515815260200184815260200183815250905060008061101e83600560009054906101000a900467ffffffffffffffff16600560109054906101000a900463ffffffff1661216f565b91509150601660030b821461103257600080fd5b7f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed816040516110619190613a36565b60405180910390a1505050505050565b60008060606110818686866122ee565b8093508194508295505050507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa836040516110bc9190613b2d565b60405180910390a1601660030b83146110d457600080fd5b7feff23992f47b3c101679f8b4dc9d3e242c903909dba4a453f2b2341ad463b0e28282604051611105929190613cd0565b60405180910390a193509350939050565b6000600167ffffffffffffffff81111561113357611132614192565b5b60405190808252806020026020018201604052801561116c57816020015b611159612b00565b8152602001906001900390816111515790505b50905061118c600080600060405180602001604052806000815250611d50565b816000815181106111a05761119f614163565b5b602002602001018190525060006040518060600160405280600063ffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff168152602001627a120063ffffffff16815250905060006040518061012001604052806002805461120b906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054611237906140a2565b80156112845780601f1061125957610100808354040283529160200191611284565b820191906000526020600020905b81548152906001019060200180831161126757829003601f168201915b505050505081526020016003805461129b906140a2565b80601f01602080910402602001604051908101604052809291908181526020018280546112c7906140a2565b80156113145780601f106112e957610100808354040283529160200191611314565b820191906000526020600020905b8154815290600101906020018083116112f757829003601f168201915b505050505081526020018673ffffffffffffffffffffffffffffffffffffffff16815260200160048054611347906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054611373906140a2565b80156113c05780601f10611395576101008083540402835291602001916113c0565b820191906000526020600020905b8154815290600101906020018083116113a357829003601f168201915b50505050508152602001600115158152602001600560089054906101000a900460070b60070b81526020016000151581526020018481526020018381525090506000600167ffffffffffffffff81111561141d5761141c614192565b5b60405190808252806020026020018201604052801561145657816020015b611443612b20565b81526020019060019003908161143b5790505b5090506040518060a00160405280600163ffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1681526020016000151581526020016000151581526020018773ffffffffffffffffffffffffffffffffffffffff16815250816000815181106114cd576114cc614163565b5b60200260200101819052506000600167ffffffffffffffff8111156114f5576114f4614192565b5b60405190808252806020026020018201604052801561152e57816020015b61151b612bfb565b8152602001906001900390816115135790505b5090506040518060c00160405280600463ffffffff168152602001600563ffffffff168152602001600a63ffffffff168152602001601e63ffffffff1681526020016000151581526020018873ffffffffffffffffffffffffffffffffffffffff16815250816000815181106115a7576115a6614163565b5b60200260200101819052506000806115ea85600560009054906101000a900467ffffffffffffffff16600560109054906101000a900463ffffffff168787612466565b915091507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8260405161161d9190613b2d565b60405180910390a1601660030b821461163557600080fd5b7f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed816040516116649190613a36565b60405180910390a1505050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016116b49493929190613a7a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161171e9190613a1f565b6000604051808303816000865af19150503d806000811461175b576040519150601f19603f3d011682016040523d82523d6000602084013e611760565b606091505b509150915081611771576015611786565b808060200190518101906117859190613158565b5b60030b92505050949350505050565b6000600567ffffffffffffffff8111156117b2576117b1614192565b5b6040519080825280602002602001820160405280156117eb57816020015b6117d8612b00565b8152602001906001900390816117d05790505b50905061180c60006006600060405180602001604052806000815250611d50565b816000815181106118205761181f614163565b5b60200260200101819052506118476001600060405180602001604052806000815250611d89565b8160018151811061185b5761185a614163565b5b60200260200101819052506118826002600060405180602001604052806000815250611d89565b8160028151811061189657611895614163565b5b60200260200101819052506118bd6004600060405180602001604052806000815250611d89565b816003815181106118d1576118d0614163565b5b60200260200101819052506118f86003600060405180602001604052806000815250611d89565b8160048151811061190c5761190b614163565b5b602002602001018190525060006040518060600160405280600063ffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff168152602001627a120063ffffffff168152509050600060405180610120016040528060028054611977906140a2565b80601f01602080910402602001604051908101604052809291908181526020018280546119a3906140a2565b80156119f05780601f106119c5576101008083540402835291602001916119f0565b820191906000526020600020905b8154815290600101906020018083116119d357829003601f168201915b5050505050815260200160038054611a07906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054611a33906140a2565b8015611a805780601f10611a5557610100808354040283529160200191611a80565b820191906000526020600020905b815481529060010190602001808311611a6357829003601f168201915b505050505081526020018573ffffffffffffffffffffffffffffffffffffffff16815260200160048054611ab3906140a2565b80601f0160208091040260200160405190810160405280929190818152602001828054611adf906140a2565b8015611b2c5780601f10611b0157610100808354040283529160200191611b2c565b820191906000526020600020905b815481529060010190602001808311611b0f57829003601f168201915b50505050508152602001600115158152602001600560089054906101000a900460070b60070b8152602001600560149054906101000a900460ff1615158152602001848152602001838152509050600080611b86836125eb565b91509150601660030b8214611b9a57600080fd5b7f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed81604051611bc99190613a36565b60405180910390a1505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401611c169493929190613a7a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611c809190613a1f565b600060405180830381855af49150503d8060008114611cbb576040519150601f19603f3d011682016040523d82523d6000602084013e611cc0565b606091505b509150915081611cd1576015611ce6565b80806020019051810190611ce59190613158565b5b60030b92505050949350505050565b6000611d018383612763565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051611d329190613b2d565b60405180910390a1601660030b8114611d4a57600080fd5b92915050565b611d58612b00565b6040518060400160405280611d6d878761287b565b8152602001611d7c85856128d1565b8152509050949350505050565b611d91612b00565b6040518060400160405280611da586612aab565b8152602001611db485856128d1565b81525090509392505050565b6000808460008161010001516000015163ffffffff16148015611df2575060008161010001516040015163ffffffff16145b15611e18576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff1634634573396960e01b8a8a8a604051602401611e5293929190613bde565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611ebc9190613a1f565b60006040518083038185875af1925050503d8060008114611ef9576040519150601f19603f3d011682016040523d82523d6000602084013e611efe565b606091505b509150915081611f115760156000611f26565b80806020019051810190611f259190613185565b5b8160030b91508095508196505050505050935093915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8686604051602401611f78929190613a51565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611fe29190613a1f565b6000604051808303816000865af19150503d806000811461201f576040519150601f19603f3d011682016040523d82523d6000602084013e612024565b606091505b50915091508161203557601561204a565b808060200190518101906120499190613158565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16632e63879b60e01b8686604051602401612090929190613abf565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516120fa9190613a1f565b6000604051808303816000865af19150503d8060008114612137576040519150601f19603f3d011682016040523d82523d6000602084013e61213c565b606091505b50915091508161214d576015612162565b808060200190518101906121619190613158565b5b60030b9250505092915050565b6000808460008161010001516000015163ffffffff161480156121a1575060008161010001516040015163ffffffff16145b156121c7576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463c23baeb660e01b8a8a8a60405160240161220193929190613c2a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161226b9190613a1f565b60006040518083038185875af1925050503d80600081146122a8576040519150601f19603f3d011682016040523d82523d6000602084013e6122ad565b606091505b5091509150816122c057601560006122d5565b808060200190518101906122d49190613185565b5b8160030b91508095508196505050505050935093915050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161232c93929190613aef565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516123969190613a1f565b6000604051808303816000865af19150503d80600081146123d3576040519150601f19603f3d011682016040523d82523d6000602084013e6123d8565b606091505b50915091508161243457601560008067ffffffffffffffff811115612400576123ff614192565b5b60405190808252806020026020018201604052801561242e5781602001602082028036833780820191505090505b50612449565b8080602001905181019061244891906131c5565b5b8260030b9250809550819650829750505050505093509350939050565b6000808660008161010001516000015163ffffffff16148015612498575060008161010001516040015163ffffffff16145b156124be576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463b937581a60e01b8c8c8c8c8c6040516024016124fc959493929190613c68565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516125669190613a1f565b60006040518083038185875af1925050503d80600081146125a3576040519150601f19603f3d011682016040523d82523d6000602084013e6125a8565b606091505b5091509150816125bb57601560006125d0565b808060200190518101906125cf9190613185565b5b8160030b915080955081965050505050509550959350505050565b6000808260008161010001516000015163ffffffff1614801561261d575060008161010001516040015163ffffffff16145b15612643576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff1634639c89bb3560e01b886040516024016126799190613bbc565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516126e39190613a1f565b60006040518083038185875af1925050503d8060008114612720576040519150601f19603f3d011682016040523d82523d6000602084013e612725565b606091505b509150915081612738576015600061274d565b8080602001905181019061274c9190613185565b5b8160030b91508095508196505050505050915091565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161279c929190613a51565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516128069190613a1f565b6000604051808303816000865af19150503d8060008114612843576040519150601f19603f3d011682016040523d82523d6000602084013e612848565b606091505b50915091508161285957601561286e565b8080602001905181019061286d9190613158565b5b60030b9250505092915050565b60006128a283600681111561289357612892614105565b5b82612aec90919063ffffffff16565b90506128c98260068111156128ba576128b9614105565b5b82612aec90919063ffffffff16565b905092915050565b6128d9612c61565b600060048111156128ed576128ec614105565b5b836004811115612900576128ff614105565b5b141561291c576001816000019015159081151581525050612aa5565b600160048111156129305761292f614105565b5b83600481111561294357612942614105565b5b14156129a65760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050612aa4565b600260048111156129ba576129b9614105565b5b8360048111156129cd576129cc614105565b5b14156129e157818160400181905250612aa3565b600360048111156129f5576129f4614105565b5b836004811115612a0857612a07614105565b5b1415612a1c57818160600181905250612aa2565b600480811115612a2f57612a2e614105565b5b836004811115612a4257612a41614105565b5b1415612aa15760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b5b5b5b5b92915050565b600060016000836006811115612ac457612ac3614105565b5b6006811115612ad657612ad5614105565b5b8152602001908152602001600020549050919050565b60008160ff166001901b8317905092915050565b604051806040016040528060008152602001612b1a612c61565b81525090565b6040518060a00160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518060c00160405280600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518060c00160405280600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6000612cd1612ccc84613d25565b613d00565b90508083825260208201905082856020860282011115612cf457612cf36141c6565b5b60005b85811015612d245781612d0a8882612e6e565b845260208401935060208301925050600181019050612cf7565b5050509392505050565b6000612d41612d3c84613d51565b613d00565b90508083825260208201905082856020860282011115612d6457612d636141c6565b5b60005b85811015612db257813567ffffffffffffffff811115612d8a57612d896141c1565b5b808601612d978982612f22565b85526020850194506020840193505050600181019050612d67565b5050509392505050565b6000612dcf612dca84613d7d565b613d00565b90508083825260208201905082856020860282011115612df257612df16141c6565b5b60005b85811015612e225781612e088882612f65565b845260208401935060208301925050600181019050612df5565b5050509392505050565b6000612e3f612e3a84613da9565b613d00565b905082815260208101848484011115612e5b57612e5a6141cb565b5b612e66848285614060565b509392505050565b600081359050612e7d816141eb565b92915050565b600081519050612e9281614202565b92915050565b600082601f830112612ead57612eac6141c1565b5b8135612ebd848260208601612cbe565b91505092915050565b600082601f830112612edb57612eda6141c1565b5b8135612eeb848260208601612d2e565b91505092915050565b600082601f830112612f0957612f086141c1565b5b8151612f19848260208601612dbc565b91505092915050565b600082601f830112612f3757612f366141c1565b5b8135612f47848260208601612e2c565b91505092915050565b600081519050612f5f81614219565b92915050565b600081519050612f7481614230565b92915050565b600081359050612f8981614247565b92915050565b600081359050612f9e8161425e565b92915050565b600081519050612fb38161425e565b92915050565b600060208284031215612fcf57612fce6141d5565b5b6000612fdd84828501612e6e565b91505092915050565b60008060408385031215612ffd57612ffc6141d5565b5b600061300b85828601612e6e565b925050602061301c85828601612e6e565b9150509250929050565b600080600080608085870312156130405761303f6141d5565b5b600061304e87828801612e6e565b945050602061305f87828801612e6e565b935050604061307087828801612e6e565b925050606061308187828801612f7a565b91505092959194509250565b600080604083850312156130a4576130a36141d5565b5b60006130b285828601612e6e565b925050602083013567ffffffffffffffff8111156130d3576130d26141d0565b5b6130df85828601612e98565b9150509250929050565b600080600060608486031215613102576131016141d5565b5b600061311086828701612e6e565b935050602061312186828701612f8f565b925050604084013567ffffffffffffffff811115613142576131416141d0565b5b61314e86828701612ec6565b9150509250925092565b60006020828403121561316e5761316d6141d5565b5b600061317c84828501612f50565b91505092915050565b6000806040838503121561319c5761319b6141d5565b5b60006131aa85828601612f50565b92505060206131bb85828601612e83565b9150509250929050565b6000806000606084860312156131de576131dd6141d5565b5b60006131ec86828701612f50565b93505060206131fd86828701612fa4565b925050604084015167ffffffffffffffff81111561321e5761321d6141d0565b5b61322a86828701612ef4565b9150509250925092565b600061324083836132d4565b60208301905092915050565b600061325883836135c1565b905092915050565b600061326c8383613649565b60208301905092915050565b600061328483836136e2565b60a08301905092915050565b600061329c838361374a565b60c08301905092915050565b60006132b4838361391c565b60c08301905092915050565b60006132cc8383613997565b905092915050565b6132dd81613fac565b82525050565b6132ec81613fac565b82525050565b60006132fd82613e4a565b6133078185613f08565b935061331283613dda565b8060005b8381101561334357815161332a8882613234565b975061333583613ead565b925050600181019050613316565b5085935050505092915050565b600061335b82613e55565b6133658185613f19565b93508360208202850161337785613dea565b8060005b858110156133b35784840389528151613394858261324c565b945061339f83613eba565b925060208a0199505060018101905061337b565b50829750879550505050505092915050565b60006133d082613e60565b6133da8185613f2a565b93506133e583613dfa565b8060005b838110156134165781516133fd8882613260565b975061340883613ec7565b9250506001810190506133e9565b5085935050505092915050565b600061342e82613e6b565b6134388185613f3b565b935061344383613e0a565b8060005b8381101561347457815161345b8882613278565b975061346683613ed4565b925050600181019050613447565b5085935050505092915050565b600061348c82613e76565b6134968185613f4c565b93506134a183613e1a565b8060005b838110156134d25781516134b98882613290565b97506134c483613ee1565b9250506001810190506134a5565b5085935050505092915050565b60006134ea82613e81565b6134f48185613f5d565b93506134ff83613e2a565b8060005b8381101561353057815161351788826132a8565b975061352283613eee565b925050600181019050613503565b5085935050505092915050565b600061354882613e8c565b6135528185613f6e565b93508360208202850161356485613e3a565b8060005b858110156135a0578484038952815161358185826132c0565b945061358c83613efb565b925060208a01995050600181019050613568565b50829750879550505050505092915050565b6135bb81613fd0565b82525050565b60006135cc82613e97565b6135d68185613f7f565b93506135e681856020860161406f565b6135ef816141da565b840191505092915050565b600061360582613e97565b61360f8185613f90565b935061361f81856020860161406f565b80840191505092915050565b61363481613fdc565b82525050565b6136438161404e565b82525050565b61365281613ff3565b82525050565b61366181613ff3565b82525050565b600061367282613ea2565b61367c8185613f9b565b935061368c81856020860161406f565b613695816141da565b840191505092915050565b6060820160008201516136b660008501826139f2565b5060208201516136c960208501826132d4565b5060408201516136dc60408501826139f2565b50505050565b60a0820160008201516136f860008501826139f2565b50602082015161370b60208501826132d4565b50604082015161371e60408501826135b2565b50606082015161373160608501826135b2565b50608082015161374460808501826132d4565b50505050565b60c08201600082015161376060008501826139f2565b50602082015161377360208501826139f2565b50604082015161378660408501826139f2565b50606082015161379960608501826139f2565b5060808201516137ac60808501826135b2565b5060a08201516137bf60a08501826132d4565b50505050565b60006101608301600083015184820360008601526137e38282613667565b915050602083015184820360208601526137fd8282613667565b915050604083015161381260408601826132d4565b506060830151848203606086015261382a8282613667565b915050608083015161383f60808601826135b2565b5060a083015161385260a0860182613649565b5060c083015161386560c08601826135b2565b5060e083015184820360e086015261387d828261353d565b9150506101008301516138946101008601826136a0565b508091505092915050565b600060a0830160008301516138b760008601826135b2565b5060208301516138ca60208601826132d4565b50604083015184820360408601526138e282826135c1565b915050606083015184820360608601526138fc82826135c1565b915050608083015161391160808601826132d4565b508091505092915050565b60c08201600082015161393260008501826139f2565b50602082015161394560208501826139f2565b50604082015161395860408501826139f2565b50606082015161396b60608501826132d4565b50608082015161397e60808501826135b2565b5060a082015161399160a08501826132d4565b50505050565b60006040830160008301516139af60008601826139d4565b50602083015184820360208601526139c7828261389f565b9150508091505092915050565b6139dd81614020565b82525050565b6139ec81614020565b82525050565b6139fb8161402a565b82525050565b613a0a8161402a565b82525050565b613a198161403a565b82525050565b6000613a2b82846135fa565b915081905092915050565b6000602082019050613a4b60008301846132e3565b92915050565b6000604082019050613a6660008301856132e3565b613a7360208301846132e3565b9392505050565b6000608082019050613a8f60008301876132e3565b613a9c60208301866132e3565b613aa960408301856132e3565b613ab660608301846139e3565b95945050505050565b6000604082019050613ad460008301856132e3565b8181036020830152613ae681846132f2565b90509392505050565b6000606082019050613b0460008301866132e3565b613b116020830185613a10565b8181036040830152613b238184613350565b9050949350505050565b6000602082019050613b42600083018461362b565b92915050565b6000606082019050613b5d600083018661362b565b613b6a6020830185613a10565b8181036040830152613b7c81846133c5565b9050949350505050565b6000602082019050613b9b600083018461363a565b92915050565b6000602082019050613bb66000830184613658565b92915050565b60006020820190508181036000830152613bd681846137c5565b905092915050565b60006060820190508181036000830152613bf881866137c5565b90508181036020830152613c0c8185613423565b90508181036040830152613c2081846134df565b9050949350505050565b60006060820190508181036000830152613c4481866137c5565b9050613c536020830185613a10565b613c606040830184613a01565b949350505050565b600060a0820190508181036000830152613c8281886137c5565b9050613c916020830187613a10565b613c9e6040830186613a01565b8181036060830152613cb08185613423565b90508181036080830152613cc48184613481565b90509695505050505050565b6000604082019050613ce56000830185613a10565b8181036020830152613cf781846133c5565b90509392505050565b6000613d0a613d1b565b9050613d1682826140d4565b919050565b6000604051905090565b600067ffffffffffffffff821115613d4057613d3f614192565b5b602082029050602081019050919050565b600067ffffffffffffffff821115613d6c57613d6b614192565b5b602082029050602081019050919050565b600067ffffffffffffffff821115613d9857613d97614192565b5b602082029050602081019050919050565b600067ffffffffffffffff821115613dc457613dc3614192565b5b613dcd826141da565b9050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000613fb782614000565b9050919050565b6000613fc982614000565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600063ffffffff82169050919050565b600067ffffffffffffffff82169050919050565b600061405982613ff3565b9050919050565b82818337600083830152505050565b60005b8381101561408d578082015181840152602081019050614072565b8381111561409c576000848401525b50505050565b600060028204905060018216806140ba57607f821691505b602082108114156140ce576140cd614134565b5b50919050565b6140dd826141da565b810181811067ffffffffffffffff821117156140fc576140fb614192565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b6141f481613fac565b81146141ff57600080fd5b50565b61420b81613fbe565b811461421657600080fd5b50565b61422281613fe6565b811461422d57600080fd5b50565b61423981613ff3565b811461424457600080fd5b50565b61425081614020565b811461425b57600080fd5b50565b6142678161403a565b811461427257600080fd5b5056fea2646970667358221220badf9999020c809b9cd3f5e09e37d2e2c92401ece71ea2aca2d95e0e59f813bb64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.json
deleted file mode 100644
index ca9a27f08b41..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.json
+++ /dev/null
@@ -1,369 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "CreatedToken",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "name": "KycGranted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      },
-      {
-        "indexed": false,
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "MintedToken",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "name": "ResponseCode",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "associateTokensPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "createFungibleTokenPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeTokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "createFungibleTokenWithCustomFeesPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "createNonFungibleTokenPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeTokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "createNonFungibleTokenWithCustomFeesPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKycPublic",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.bin
deleted file mode 100644
index ff1a37b5256d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061029c806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063efc3882614610030575b600080fd5b61004a6004803603810190610045919061013a565b61004c565b005b8173ffffffffffffffffffffffffffffffffffffffff1663095ea7b382677fffffffffffffff6040518363ffffffff1660e01b815260040161008f9291906101d8565b6020604051808303816000875af11580156100ae573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d29190610239565b505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610107826100dc565b9050919050565b610117816100fc565b811461012257600080fd5b50565b6000813590506101348161010e565b92915050565b60008060408385031215610151576101506100d7565b5b600061015f85828601610125565b925050602061017085828601610125565b9150509250929050565b610183816100fc565b82525050565b6000819050919050565b6000819050919050565b6000819050919050565b60006101c26101bd6101b884610189565b61019d565b610193565b9050919050565b6101d2816101a7565b82525050565b60006040820190506101ed600083018561017a565b6101fa60208301846101c9565b9392505050565b60008115159050919050565b61021681610201565b811461022157600080fd5b50565b6000815190506102338161020d565b92915050565b60006020828403121561024f5761024e6100d7565b5b600061025d84828501610224565b9150509291505056fea264697066735822122029f84d58f6a607d4e0e7b93373b10e427fd5ad393e0d3c66eb38081290860d3764736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.json
deleted file mode 100644
index 3f1d6abe2b54..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_attacker",
-          "type": "address"
-        }
-      ],
-      "name": "doIndirectApproval",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.bin
deleted file mode 100644
index 1185e3ba2e12..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610da7806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630ed072761461003b5780637c41ad2c14610057575b600080fd5b6100556004803603810190610050919061080a565b610087565b005b610071600480360381019061006c9190610853565b6100de565b60405161007e9190610899565b60405180910390f35b6000610092826101f3565b9050601660030b81146100da576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100d190610911565b60405180910390fd5b5050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016101159190610940565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161017f91906109cc565b6000604051808303816000865af19150503d80600081146101bc576040519150601f19603f3d011682016040523d82523d6000602084013e6101c1565b606091505b5091509150816101d25760156101e7565b808060200190518101906101e69190610a1c565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663189a554c60e01b8560405160240161022a9190610d4f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161029491906109cc565b6000604051808303816000865af19150503d80600081146102d1576040519150601f19603f3d011682016040523d82523d6000602084013e6102d6565b606091505b5091509150816102e75760156102fc565b808060200190518101906102fb9190610a1c565b5b60030b92505050919050565b6000604051905090565b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61036a82610321565b810181811067ffffffffffffffff8211171561038957610388610332565b5b80604052505050565b600061039c610308565b90506103a88282610361565b919050565b600067ffffffffffffffff8211156103c8576103c7610332565b5b602082029050602081019050919050565b600080fd5b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610413826103e8565b9050919050565b61042381610408565b811461042e57600080fd5b50565b6000813590506104408161041a565b92915050565b600067ffffffffffffffff82111561046157610460610332565b5b602082029050602081019050919050565b60008160070b9050919050565b61048881610472565b811461049357600080fd5b50565b6000813590506104a58161047f565b92915050565b6000604082840312156104c1576104c06103de565b5b6104cb6040610392565b905060006104db84828501610431565b60008301525060206104ef84828501610496565b60208301525092915050565b600061050e61050984610446565b610392565b90508083825260208201905060408402830185811115610531576105306103d9565b5b835b8181101561055a578061054688826104ab565b845260208401935050604081019050610533565b5050509392505050565b600082601f8301126105795761057861031c565b5b81356105898482602086016104fb565b91505092915050565b600067ffffffffffffffff8211156105ad576105ac610332565b5b602082029050602081019050919050565b6000606082840312156105d4576105d36103de565b5b6105de6060610392565b905060006105ee84828501610431565b600083015250602061060284828501610431565b602083015250604061061684828501610496565b60408301525092915050565b600061063561063084610592565b610392565b90508083825260208201905060608402830185811115610658576106576103d9565b5b835b81811015610681578061066d88826105be565b84526020840193505060608101905061065a565b5050509392505050565b600082601f8301126106a05761069f61031c565b5b81356106b0848260208601610622565b91505092915050565b6000606082840312156106cf576106ce6103de565b5b6106d96060610392565b905060006106e984828501610431565b600083015250602082013567ffffffffffffffff81111561070d5761070c6103e3565b5b61071984828501610564565b602083015250604082013567ffffffffffffffff81111561073d5761073c6103e3565b5b6107498482850161068b565b60408301525092915050565b6000610768610763846103ad565b610392565b9050808382526020820190506020840283018581111561078b5761078a6103d9565b5b835b818110156107d257803567ffffffffffffffff8111156107b0576107af61031c565b5b8086016107bd89826106b9565b8552602085019450505060208101905061078d565b5050509392505050565b600082601f8301126107f1576107f061031c565b5b8135610801848260208601610755565b91505092915050565b6000602082840312156108205761081f610312565b5b600082013567ffffffffffffffff81111561083e5761083d610317565b5b61084a848285016107dc565b91505092915050565b60006020828403121561086957610868610312565b5b600061087784828501610431565b91505092915050565b6000819050919050565b61089381610880565b82525050565b60006020820190506108ae600083018461088a565b92915050565b600082825260208201905092915050565b7f43727970746f205472616e73666572204661696c656400000000000000000000600082015250565b60006108fb6016836108b4565b9150610906826108c5565b602082019050919050565b6000602082019050818103600083015261092a816108ee565b9050919050565b61093a81610408565b82525050565b60006020820190506109556000830184610931565b92915050565b600081519050919050565b600081905092915050565b60005b8381101561098f578082015181840152602081019050610974565b60008484015250505050565b60006109a68261095b565b6109b08185610966565b93506109c0818560208601610971565b80840191505092915050565b60006109d8828461099b565b915081905092915050565b60008160030b9050919050565b6109f9816109e3565b8114610a0457600080fd5b50565b600081519050610a16816109f0565b92915050565b600060208284031215610a3257610a31610312565b5b6000610a4084828501610a07565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b610a7e81610408565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b610ab981610472565b82525050565b604082016000820151610ad56000850182610a75565b506020820151610ae86020850182610ab0565b50505050565b6000610afa8383610abf565b60408301905092915050565b6000602082019050919050565b6000610b1e82610a84565b610b288185610a8f565b9350610b3383610aa0565b8060005b83811015610b64578151610b4b8882610aee565b9750610b5683610b06565b925050600181019050610b37565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b606082016000820151610bb36000850182610a75565b506020820151610bc66020850182610a75565b506040820151610bd96040850182610ab0565b50505050565b6000610beb8383610b9d565b60608301905092915050565b6000602082019050919050565b6000610c0f82610b71565b610c198185610b7c565b9350610c2483610b8d565b8060005b83811015610c55578151610c3c8882610bdf565b9750610c4783610bf7565b925050600181019050610c28565b5085935050505092915050565b6000606083016000830151610c7a6000860182610a75565b5060208301518482036020860152610c928282610b13565b91505060408301518482036040860152610cac8282610c04565b9150508091505092915050565b6000610cc58383610c62565b905092915050565b6000602082019050919050565b6000610ce582610a49565b610cef8185610a54565b935083602082028501610d0185610a65565b8060005b85811015610d3d5784840389528151610d1e8582610cb9565b9450610d2983610ccd565b925060208a01995050600181019050610d05565b50829750879550505050505092915050565b60006020820190508181036000830152610d698184610cda565b90509291505056fea26469706673582212200185ccd8db789ed31eea3a5acb4895a35833d6933a486991d86a00e0a6d317c964736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.json
deleted file mode 100644
index 14a4a0b16f4d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "transferMultipleTokens",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.bin
deleted file mode 100644
index 4bc66de52906..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50600060405161001f906101b7565b604051809103906000f08015801561003b573d6000803e3d6000fd5b509080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060006040516100aa906101b7565b604051809103906000f0801580156100c6573d6000803e3d6000fd5b509080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000604051610135906101b7565b604051809103906000f080158015610151573d6000803e3d6000fd5b509080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101c4565b6101dc80610a6b83390190565b610898806101d36000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063ae3ea5081161005b578063ae3ea508146100ef578063b678c38a1461011f578063d02669ad1461013b578063d04326521461015757610088565b806306df1d341461008d57806356ad0e88146100bd5780635a55b577146100db578063add702f0146100e5575b600080fd5b6100a760048036038101906100a2919061054b565b610175565b6040516100b491906105b9565b60405180910390f35b6100c56101bc565b6040516100d291906105e3565b60405180910390f35b6100e36101c8565b005b6100ed61025b565b005b6101096004803603810190610104919061054b565b6102ef565b60405161011691906105b9565b60405180910390f35b6101396004803603810190610134919061054b565b610337565b005b6101556004803603810190610150919061054b565b610456565b005b61015f6104f6565b60405161016c91906105e3565b60405180910390f35b600080828154811061018a576101896105fe565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b60008080549050905090565b60006040516101d690610503565b604051809103906000f0801580156101f2573d6000803e3d6000fd5b5090506000819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600060405161026990610503565b604051809103906000f080158015610285573d6000803e3d6000fd5b5090506000819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055600080fd5b600060018281548110610305576103046105fe565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600080828154811061034c5761034b6105fe565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff1663c34c041c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156103c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ec9190610659565b90506001819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050565b600080828154811061046b5761046a6105fe565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639710dbd96040518163ffffffff1660e01b8152600401600060405180830381600087803b1580156104e057600080fd5b505af19250505080156104f1575060015b505050565b6000600180549050905090565b6101dc8061068783390190565b600080fd5b6000819050919050565b61052881610515565b811461053357600080fd5b50565b6000813590506105458161051f565b92915050565b60006020828403121561056157610560610510565b5b600061056f84828501610536565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006105a382610578565b9050919050565b6105b381610598565b82525050565b60006020820190506105ce60008301846105aa565b92915050565b6105dd81610515565b82525050565b60006020820190506105f860008301846105d4565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b61063681610598565b811461064157600080fd5b50565b6000815190506106538161062d565b92915050565b60006020828403121561066f5761066e610510565b5b600061067d84828501610644565b9150509291505056fe608060405234801561001057600080fd5b506101bc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80639710dbd91461003b578063c34c041c14610045575b600080fd5b610043610063565b005b61004d610092565b60405161005a919061010f565b60405180910390f35b6000604051610071906100c2565b604051809103906000f08015801561008d573d6000803e3d6000fd5b600080fd5b60006040516100a0906100c2565b604051809103906000f0801580156100bc573d6000803e3d6000fd5b50905090565b605c8061012b83390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100f9826100ce565b9050919050565b610109816100ee565b82525050565b60006020820190506101246000830184610100565b9291505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220e34f26c639b122c28bedb3934cdded760610d8d852e55bdb60c8970bda0de9e664736f6c63430008100033a264697066735822122063a39b494613c08c45207d94a4ebb1185da87716872d43d26cb2e5d4ec1bc69264736f6c63430008100033a26469706673582212202eb7532319427dd00ef5684c639c2ff59cd96d7a6f64152113e811ce9f83163364736f6c63430008100033608060405234801561001057600080fd5b506101bc806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80639710dbd91461003b578063c34c041c14610045575b600080fd5b610043610063565b005b61004d610092565b60405161005a919061010f565b60405180910390f35b6000604051610071906100c2565b604051809103906000f08015801561008d573d6000803e3d6000fd5b600080fd5b60006040516100a0906100c2565b604051809103906000f0801580156100bc573d6000803e3d6000fd5b50905090565b605c8061012b83390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100f9826100ce565b9050919050565b610109816100ee565b82525050565b60006020820190506101246000830184610100565b9291505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220e34f26c639b122c28bedb3934cdded760610d8d852e55bdb60c8970bda0de9e664736f6c63430008100033a264697066735822122063a39b494613c08c45207d94a4ebb1185da87716872d43d26cb2e5d4ec1bc69264736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.json b/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.json
deleted file mode 100644
index 149e01220132..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"uint256","name":"_index","type":"uint256"}],"name":"deployChildAndRevertFromParentContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_index","type":"uint256"}],"name":"deployChildFromParentContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"deployParentContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"deployParentContractAndRevert","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_index","type":"uint256"}],"name":"getChildContractsByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getChildContractsSize","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_index","type":"uint256"}],"name":"getParentContractsByIndex","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getParentContractsSize","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.bin
deleted file mode 100644
index 1af22c292e1e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-60606040526002805460ff19166003179055341561001c57600080fd5b604051610a1f380380610a1f833981016040528080519190602001805182019190602001805160025460ff16600a0a85026003819055600160a060020a03331660009081526004602052604081209190915592019190508280516100849291602001906100a1565b5060018180516100989291602001906100a1565b5050505061013c565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106100e257805160ff191683800117855561010f565b8280016001018555821561010f579182015b8281111561010f5782518255916020019190600101906100f4565b5061011b92915061011f565b5090565b61013991905b8082111561011b5760008155600101610125565b90565b6108d48061014b6000396000f3006060604052600436106100b95763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166306fdde0381146100be578063095ea7b31461014857806318160ddd1461017e57806323b872dd146101a3578063313ce567146101cb57806342966c68146101f457806370a082311461020a57806379cc67901461022957806395d89b411461024b578063a9059cbb1461025e578063cae9ca5114610282578063dd62ed3e146102e7575b600080fd5b34156100c957600080fd5b6100d161030c565b60405160208082528190810183818151815260200191508051906020019080838360005b8381101561010d5780820151838201526020016100f5565b50505050905090810190601f16801561013a5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561015357600080fd5b61016a600160a060020a03600435166024356103aa565b604051901515815260200160405180910390f35b341561018957600080fd5b6101916103da565b60405190815260200160405180910390f35b34156101ae57600080fd5b61016a600160a060020a03600435811690602435166044356103e0565b34156101d657600080fd5b6101de610457565b60405160ff909116815260200160405180910390f35b34156101ff57600080fd5b61016a600435610460565b341561021557600080fd5b610191600160a060020a03600435166104eb565b341561023457600080fd5b61016a600160a060020a03600435166024356104fd565b341561025657600080fd5b6100d16105d9565b341561026957600080fd5b610280600160a060020a0360043516602435610644565b005b341561028d57600080fd5b61016a60048035600160a060020a03169060248035919060649060443590810190830135806020601f8201819004810201604051908101604052818152929190602084018383808284375094965061065395505050505050565b34156102f257600080fd5b610191600160a060020a0360043581169060243516610785565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103a25780601f10610377576101008083540402835291602001916103a2565b820191906000526020600020905b81548152906001019060200180831161038557829003601f168201915b505050505081565b600160a060020a033381166000908152600560209081526040808320938616835292905220819055600192915050565b60035481565b600160a060020a0380841660009081526005602090815260408083203390941683529290529081205482111561041557600080fd5b600160a060020a038085166000908152600560209081526040808320339094168352929052208054839003905561044d8484846107a2565b5060019392505050565b60025460ff1681565b600160a060020a0333166000908152600460205260408120548290101561048657600080fd5b600160a060020a03331660008181526004602052604090819020805485900390556003805485900390557fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca59084905190815260200160405180910390a2506001919050565b60046020526000908152604090205481565b600160a060020a0382166000908152600460205260408120548290101561052357600080fd5b600160a060020a038084166000908152600560209081526040808320339094168352929052205482111561055657600080fd5b600160a060020a038084166000818152600460209081526040808320805488900390556005825280832033909516835293905282902080548590039055600380548590039055907fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca59084905190815260200160405180910390a250600192915050565b60018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103a25780601f10610377576101008083540402835291602001916103a2565b61064f3383836107a2565b5050565b60008361066081856103aa565b1561077d5780600160a060020a0316638f4ffcb1338630876040518563ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018085600160a060020a0316600160a060020a0316815260200184815260200183600160a060020a0316600160a060020a0316815260200180602001828103825283818151815260200191508051906020019080838360005b838110156107165780820151838201526020016106fe565b50505050905090810190601f1680156107435780820380516001836020036101000a031916815260200191505b5095505050505050600060405180830381600087803b151561076457600080fd5b6102c65a03f1151561077557600080fd5b505050600191505b509392505050565b600560209081526000928352604080842090915290825290205481565b6000600160a060020a03831615156107b957600080fd5b600160a060020a038416600090815260046020526040902054829010156107df57600080fd5b600160a060020a0383166000908152600460205260409020548281011161080557600080fd5b50600160a060020a0380831660008181526004602052604080822080549488168084528284208054888103909155938590528154870190915591909301927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9085905190815260200160405180910390a3600160a060020a038084166000908152600460205260408082205492871682529020540181146108a257fe5b505050505600a165627a7a72305820151838f56e56b50f63e5428562d62b53d57e4697dd0e1ff7d53b4eb1d8d108ff0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.json
deleted file mode 100644
index bd6525a24b2d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OcToken/OcToken.json
+++ /dev/null
@@ -1,136 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "name": "initialSupply",
-        "type": "uint256"
-      },
-      {
-        "name": "tokenName",
-        "type": "string"
-      },
-      {
-        "name": "tokenSymbol",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "decimals",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [
-      {
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "name": "_to",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_spender",
-        "type": "address"
-      },
-      {
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [
-      {
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.bin
deleted file mode 100644
index 511c27da7806..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234156100135761001261003b565b5b61001b610040565b610023610031565b610421610043823961042181f35b6000604051905090565b600080fd5b56fe608060405260043610610094576100176000356100a1565b80631bdbf00f811461005457634cb909a3811461006157638d71c7ff811461006e576399174e14811461007b5763b20ba9b1811461008857610091565b61005c610181565b610091565b61006961025c565b610091565b610076610298565b610091565b6100836102ec565b610091565b610090610326565b5b50505b61009c610362565b6103ea565b60008160e01c9050919050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100ed826100c2565b9050919050565b6100fd816100e2565b811461010857600080fd5b50565b60008135905061011a816100f4565b92915050565b600060208284031215610136576101356100bd565b5b60006101448482850161010b565b91505092915050565b6000819050919050565b6101608161014d565b82525050565b600060208201905061017b6000830184610157565b92915050565b34156101905761018f6100b8565b5b61019b366004610120565b6101a4816103bc565b6101ac6100ae565b6101b68282610166565b81810382f35b6000819050919050565b6101cf816101bc565b81146101da57600080fd5b50565b6000813590506101ec816101c6565b92915050565b60008060408385031215610209576102086100bd565b5b6000610217858286016101dd565b9250506020610228858286016101dd565b9150509250929050565b61023b816101bc565b82525050565b60006020820190506102566000830184610232565b92915050565b341561026b5761026a6100b8565b5b6102763660046101f2565b610280818361036c565b6102886100ae565b6102928282610241565b81810382f35b34156102a7576102a66100b8565b5b6102b23660046101f2565b6102bc818361039e565b6102c46100ae565b6102ce8282610241565b81810382f35b600081830312156102e8576102e76100bd565b5b5050565b34156102fb576102fa6100b8565b5b6103063660046102d4565b61030e6103d3565b6103166100ae565b6103208282610241565b81810382f35b3415610335576103346100b8565b5b6103403660046101f2565b61034a8183610385565b6103526100ae565b61035c8282610241565b81810382f35b600080fd5b600090565b6000610376610367565b80915083831b91505092915050565b600061038f610367565b80915083831c91505092915050565b60006103a8610367565b80915083831d91505092915050565b600090565b60006103c66103b7565b809150823f915050919050565b60006103dd610367565b809150605f5f0191505090565bfea264697066735822122040d2acd08d25f887b5d23d2fd64dd2e946e3d12bc52eb4a9dd64654a34838b4e64736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.json
deleted file mode 100644
index 38bf8b41b000..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.json
+++ /dev/null
@@ -1,106 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_addr",
-        "type": "address"
-      }
-    ],
-    "name": "opExtCodeHash",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_resp",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "opPush0",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_resp",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_one",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_two",
-        "type": "uint256"
-      }
-    ],
-    "name": "opSar",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_resp",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_one",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_two",
-        "type": "uint256"
-      }
-    ],
-    "name": "opShl",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_resp",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_one",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_two",
-        "type": "uint256"
-      }
-    ],
-    "name": "opShr",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_resp",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.bin
deleted file mode 100644
index 1541161f8254..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506108a3806100206000396000f3fe608060405234801561001057600080fd5b506004361061002a5760003560e01c8062610f231461002f575b600080fd5b61004960048036038101906100449190610212565b61004b565b005b7f010101010101010010101010101010010101010101010111010101010101010160001b8160405161007c906100ab565b61008691906102e3565b8190604051809103906000f59050801580156100a6573d6000803e3d6000fd5b505050565b6105688061030683390190565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61011f826100d6565b810181811067ffffffffffffffff8211171561013e5761013d6100e7565b5b80604052505050565b60006101516100b8565b905061015d8282610116565b919050565b600067ffffffffffffffff82111561017d5761017c6100e7565b5b610186826100d6565b9050602081019050919050565b82818337600083830152505050565b60006101b56101b084610162565b610147565b9050828152602081018484840111156101d1576101d06100d1565b5b6101dc848285610193565b509392505050565b600082601f8301126101f9576101f86100cc565b5b81356102098482602086016101a2565b91505092915050565b600060208284031215610228576102276100c2565b5b600082013567ffffffffffffffff811115610246576102456100c7565b5b610252848285016101e4565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b8381101561029557808201518184015260208101905061027a565b838111156102a4576000848401525b50505050565b60006102b58261025b565b6102bf8185610266565b93506102cf818560208601610277565b6102d8816100d6565b840191505092915050565b600060208201905081810360008301526102fd81846102aa565b90509291505056fe608060405234801561001057600080fd5b5060405161056838038061056883398181016040528101906100329190610245565b600181a060aa600182a160bb60aa600183a27f020202020202020020202020202020020202020202020222020202020202020260001b81604051610075906100ba565b61007f91906102e3565b8190604051809103906000f590508015801561009f573d6000803e3d6000fd5b50503373ffffffffffffffffffffffffffffffffffffffff16ff5b6102628061030683390190565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61012e826100e5565b810181811067ffffffffffffffff8211171561014d5761014c6100f6565b5b80604052505050565b60006101606100c7565b905061016c8282610125565b919050565b600067ffffffffffffffff82111561018c5761018b6100f6565b5b610195826100e5565b9050602081019050919050565b60005b838110156101c05780820151818401526020810190506101a5565b838111156101cf576000848401525b50505050565b60006101e86101e384610171565b610156565b905082815260208101848484011115610204576102036100e0565b5b61020f8482856101a2565b509392505050565b600082601f83011261022c5761022b6100db565b5b815161023c8482602086016101d5565b91505092915050565b60006020828403121561025b5761025a6100d1565b5b600082015167ffffffffffffffff811115610279576102786100d6565b5b61028584828501610217565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60006102b58261028e565b6102bf8185610299565b93506102cf8185602086016101a2565b6102d8816100e5565b840191505092915050565b600060208201905081810360008301526102fd81846102aa565b90509291505056fe608060405234801561001057600080fd5b50604051610262380380610262833981810160405281019061003291906101cc565b60cc60bb60aa600184a360dd60cc60bb60aa600185a450610215565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6100b58261006c565b810181811067ffffffffffffffff821117156100d4576100d361007d565b5b80604052505050565b60006100e761004e565b90506100f382826100ac565b919050565b600067ffffffffffffffff8211156101135761011261007d565b5b61011c8261006c565b9050602081019050919050565b60005b8381101561014757808201518184015260208101905061012c565b83811115610156576000848401525b50505050565b600061016f61016a846100f8565b6100dd565b90508281526020810184848401111561018b5761018a610067565b5b610196848285610129565b509392505050565b600082601f8301126101b3576101b2610062565b5b81516101c384826020860161015c565b91505092915050565b6000602082840312156101e2576101e1610058565b5b600082015167ffffffffffffffff811115610200576101ff61005d565b5b61020c8482850161019e565b91505092915050565b603f806102236000396000f3fe6080604052600080fdfea2646970667358221220fbfc4ad53ffc702619c8d3fa885dbdc35fe0d70bb7da81ffe2b6052471631ab664736f6c634300080c0033a2646970667358221220126d885b783081fb03f6a4b3004956a30c43d41cf3c774c068ed2d0831a1825f64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.json
deleted file mode 100644
index 8af725a00a29..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "logMessage",
-        "type": "bytes"
-      }
-    ],
-    "name": "startChain",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.bin
deleted file mode 100644
index cf1a528a5424..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061195c806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806315dacbea146100515780631a91b4f814610081578063618dc65e146100b35780639b23d3d9146100cf575b600080fd5b61006b600480360381019061006691906107dd565b6100ff565b6040516100789190610860565b60405180910390f35b61009b600480360381019061009691906108a7565b61021d565b6040516100aa9392919061090f565b60405180910390f35b6100cd60048036038101906100c89190610a8c565b610249565b005b6100e960048036038101906100e491906107dd565b610370565b6040516100f69190610860565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b8888888860405160240161013c9493929190610af7565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101a69190610bb6565b6000604051808303816000865af19150503d80600081146101e3576040519150601f19603f3d011682016040523d82523d6000602084013e6101e8565b606091505b5091509150816101f957601561020e565b8080602001905181019061020d9190610c06565b5b60030b92505050949350505050565b600080600080600061022f878761048e565b915091508060400151338394509450945050509250925092565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663618dc65e60e01b8585604051602401610280929190610c7d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102ea9190610bb6565b6000604051808303816000865af19150503d8060008114610327576040519150601f19603f3d011682016040523d82523d6000602084013e61032c565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc8282604051610362929190610cc8565b60405180910390a150505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016103ad9493929190610af7565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104179190610bb6565b6000604051808303816000865af19150503d8060008114610454576040519150601f19603f3d011682016040523d82523d6000602084013e610459565b606091505b50915091508161046a57601561047f565b8080602001905181019061047e9190610c06565b5b60030b92505050949350505050565b60006104986105c0565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663287e1da860e01b87876040516024016104cf929190610cf8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105399190610bb6565b600060405180830381855afa9150503d8060008114610574576040519150601f19603f3d011682016040523d82523d6000602084013e610579565b606091505b50915091506105866105c0565b82610593576015816105a8565b818060200190518101906105a791906118ca565b5b8160030b915080955081965050505050509250929050565b6040518060c001604052806105d361062e565b8152602001600060070b8152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600060070b815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b604051806101200160405280610642610689565b8152602001600060070b8152602001600015158152602001600015158152602001600015158152602001606081526020016060815260200160608152602001606081525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b8152602001600015158152602001606081526020016106f26106f8565b81525090565b6040518060600160405280600060070b8152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600060070b81525090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061077482610749565b9050919050565b61078481610769565b811461078f57600080fd5b50565b6000813590506107a18161077b565b92915050565b6000819050919050565b6107ba816107a7565b81146107c557600080fd5b50565b6000813590506107d7816107b1565b92915050565b600080600080608085870312156107f7576107f661073f565b5b600061080587828801610792565b945050602061081687828801610792565b935050604061082787828801610792565b9250506060610838878288016107c8565b91505092959194509250565b60008160070b9050919050565b61085a81610844565b82525050565b60006020820190506108756000830184610851565b92915050565b61088481610844565b811461088f57600080fd5b50565b6000813590506108a18161087b565b92915050565b600080604083850312156108be576108bd61073f565b5b60006108cc85828601610792565b92505060206108dd85828601610892565b9150509250929050565b6108f081610769565b82525050565b6000819050919050565b610909816108f6565b82525050565b600060608201905061092460008301866108e7565b61093160208301856108e7565b61093e6040830184610900565b949350505050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61099982610950565b810181811067ffffffffffffffff821117156109b8576109b7610961565b5b80604052505050565b60006109cb610735565b90506109d78282610990565b919050565b600067ffffffffffffffff8211156109f7576109f6610961565b5b610a0082610950565b9050602081019050919050565b82818337600083830152505050565b6000610a2f610a2a846109dc565b6109c1565b905082815260208101848484011115610a4b57610a4a61094b565b5b610a56848285610a0d565b509392505050565b600082601f830112610a7357610a72610946565b5b8135610a83848260208601610a1c565b91505092915050565b60008060408385031215610aa357610aa261073f565b5b6000610ab185828601610792565b925050602083013567ffffffffffffffff811115610ad257610ad1610744565b5b610ade85828601610a5e565b9150509250929050565b610af1816107a7565b82525050565b6000608082019050610b0c60008301876108e7565b610b1960208301866108e7565b610b2660408301856108e7565b610b336060830184610ae8565b95945050505050565b600081519050919050565b600081905092915050565b60005b83811015610b70578082015181840152602081019050610b55565b83811115610b7f576000848401525b50505050565b6000610b9082610b3c565b610b9a8185610b47565b9350610baa818560208601610b52565b80840191505092915050565b6000610bc28284610b85565b915081905092915050565b60008160030b9050919050565b610be381610bcd565b8114610bee57600080fd5b50565b600081519050610c0081610bda565b92915050565b600060208284031215610c1c57610c1b61073f565b5b6000610c2a84828501610bf1565b91505092915050565b600082825260208201905092915050565b6000610c4f82610b3c565b610c598185610c33565b9350610c69818560208601610b52565b610c7281610950565b840191505092915050565b6000604082019050610c9260008301856108e7565b8181036020830152610ca48184610c44565b90509392505050565b60008115159050919050565b610cc281610cad565b82525050565b6000604082019050610cdd6000830185610cb9565b8181036020830152610cef8184610c44565b90509392505050565b6000604082019050610d0d60008301856108e7565b610d1a6020830184610851565b9392505050565b600080fd5b600080fd5b600067ffffffffffffffff821115610d4657610d45610961565b5b610d4f82610950565b9050602081019050919050565b6000610d6f610d6a84610d2b565b6109c1565b905082815260208101848484011115610d8b57610d8a61094b565b5b610d96848285610b52565b509392505050565b600082601f830112610db357610db2610946565b5b8151610dc3848260208601610d5c565b91505092915050565b600081519050610ddb8161077b565b92915050565b610dea81610cad565b8114610df557600080fd5b50565b600081519050610e0781610de1565b92915050565b600081519050610e1c8161087b565b92915050565b600067ffffffffffffffff821115610e3d57610e3c610961565b5b602082029050602081019050919050565b600080fd5b600081519050610e62816107b1565b92915050565b6000610e7b610e76846109dc565b6109c1565b905082815260208101848484011115610e9757610e9661094b565b5b610ea2848285610b52565b509392505050565b600082601f830112610ebf57610ebe610946565b5b8151610ecf848260208601610e68565b91505092915050565b600060a08284031215610eee57610eed610d21565b5b610ef860a06109c1565b90506000610f0884828501610df8565b6000830152506020610f1c84828501610dcc565b602083015250604082015167ffffffffffffffff811115610f4057610f3f610d26565b5b610f4c84828501610eaa565b604083015250606082015167ffffffffffffffff811115610f7057610f6f610d26565b5b610f7c84828501610eaa565b6060830152506080610f9084828501610dcc565b60808301525092915050565b600060408284031215610fb257610fb1610d21565b5b610fbc60406109c1565b90506000610fcc84828501610e53565b600083015250602082015167ffffffffffffffff811115610ff057610fef610d26565b5b610ffc84828501610ed8565b60208301525092915050565b600061101b61101684610e22565b6109c1565b9050808382526020820190506020840283018581111561103e5761103d610e4e565b5b835b8181101561108557805167ffffffffffffffff81111561106357611062610946565b5b8086016110708982610f9c565b85526020850194505050602081019050611040565b5050509392505050565b600082601f8301126110a4576110a3610946565b5b81516110b4848260208601611008565b91505092915050565b6000606082840312156110d3576110d2610d21565b5b6110dd60606109c1565b905060006110ed84828501610e0d565b600083015250602061110184828501610dcc565b602083015250604061111584828501610e0d565b60408301525092915050565b6000610160828403121561113857611137610d21565b5b6111436101206109c1565b9050600082015167ffffffffffffffff81111561116357611162610d26565b5b61116f84828501610d9e565b600083015250602082015167ffffffffffffffff81111561119357611192610d26565b5b61119f84828501610d9e565b60208301525060406111b384828501610dcc565b604083015250606082015167ffffffffffffffff8111156111d7576111d6610d26565b5b6111e384828501610d9e565b60608301525060806111f784828501610df8565b60808301525060a061120b84828501610e0d565b60a08301525060c061121f84828501610df8565b60c08301525060e082015167ffffffffffffffff81111561124357611242610d26565b5b61124f8482850161108f565b60e083015250610100611264848285016110bd565b6101008301525092915050565b600067ffffffffffffffff82111561128c5761128b610961565b5b602082029050602081019050919050565b600060a082840312156112b3576112b2610d21565b5b6112bd60a06109c1565b905060006112cd84828501610e0d565b60008301525060206112e184828501610dcc565b60208301525060406112f584828501610df8565b604083015250606061130984828501610df8565b606083015250608061131d84828501610dcc565b60808301525092915050565b600061133c61133784611271565b6109c1565b90508083825260208201905060a0840283018581111561135f5761135e610e4e565b5b835b818110156113885780611374888261129d565b84526020840193505060a081019050611361565b5050509392505050565b600082601f8301126113a7576113a6610946565b5b81516113b7848260208601611329565b91505092915050565b600067ffffffffffffffff8211156113db576113da610961565b5b602082029050602081019050919050565b600060c0828403121561140257611401610d21565b5b61140c60c06109c1565b9050600061141c84828501610e0d565b600083015250602061143084828501610e0d565b602083015250604061144484828501610e0d565b604083015250606061145884828501610e0d565b606083015250608061146c84828501610df8565b60808301525060a061148084828501610dcc565b60a08301525092915050565b600061149f61149a846113c0565b6109c1565b90508083825260208201905060c084028301858111156114c2576114c1610e4e565b5b835b818110156114eb57806114d788826113ec565b84526020840193505060c0810190506114c4565b5050509392505050565b600082601f83011261150a57611509610946565b5b815161151a84826020860161148c565b91505092915050565b600067ffffffffffffffff82111561153e5761153d610961565b5b602082029050602081019050919050565b600060c0828403121561156557611564610d21565b5b61156f60c06109c1565b9050600061157f84828501610e0d565b600083015250602061159384828501610e0d565b60208301525060406115a784828501610e0d565b60408301525060606115bb84828501610dcc565b60608301525060806115cf84828501610df8565b60808301525060a06115e384828501610dcc565b60a08301525092915050565b60006116026115fd84611523565b6109c1565b90508083825260208201905060c0840283018581111561162557611624610e4e565b5b835b8181101561164e578061163a888261154f565b84526020840193505060c081019050611627565b5050509392505050565b600082601f83011261166d5761166c610946565b5b815161167d8482602086016115ef565b91505092915050565b6000610120828403121561169d5761169c610d21565b5b6116a86101206109c1565b9050600082015167ffffffffffffffff8111156116c8576116c7610d26565b5b6116d484828501611121565b60008301525060206116e884828501610e0d565b60208301525060406116fc84828501610df8565b604083015250606061171084828501610df8565b606083015250608061172484828501610df8565b60808301525060a082015167ffffffffffffffff81111561174857611747610d26565b5b61175484828501611392565b60a08301525060c082015167ffffffffffffffff81111561177857611777610d26565b5b611784848285016114f5565b60c08301525060e082015167ffffffffffffffff8111156117a8576117a7610d26565b5b6117b484828501611658565b60e08301525061010082015167ffffffffffffffff8111156117d9576117d8610d26565b5b6117e584828501610d9e565b6101008301525092915050565b600060c0828403121561180857611807610d21565b5b61181260c06109c1565b9050600082015167ffffffffffffffff81111561183257611831610d26565b5b61183e84828501611686565b600083015250602061185284828501610e0d565b602083015250604061186684828501610dcc565b604083015250606061187a84828501610e0d565b606083015250608082015167ffffffffffffffff81111561189e5761189d610d26565b5b6118aa84828501610eaa565b60808301525060a06118be84828501610dcc565b60a08301525092915050565b600080604083850312156118e1576118e061073f565b5b60006118ef85828601610bf1565b925050602083015167ffffffffffffffff8111156119105761190f610744565b5b61191c858286016117f2565b915050925092905056fea2646970667358221220251f9df230fa9b8f3fd51b39012036cca4fc722417949a50fa4cc512f2b8217464736f6c634300080f0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.json b/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.json
deleted file mode 100644
index d5a38b4f0a52..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.json
+++ /dev/null
@@ -1,141 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      }
-    ],
-    "name": "isOwner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "int256",
-        "name": "",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.bin
deleted file mode 100644
index f5caef649762..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260405161001090610071565b604051809103906000f08015801561002c573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061007d565b60a18061018c83390190565b6101008061008c6000396000f3fe608060405260043610601c5760003560e01c8063dc26c1fb14601e575b005b348015602957600080fd5b50605360048036036020811015603e57600080fd5b81019080803590602001909291905050506055565b005b80471015606157600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801560c7573d6000803e3d6000fd5b505056fea265627a7a723158202813b9d5d0523613d25b93d4f38181f757edefc0cc9141cdeecc67b50264ced664736f6c634300051100326080604052348015600f57600080fd5b5060838061001e6000396000f3fe608060405260043610601c5760003560e01c8063d321fe2914601e575b005b348015602957600080fd5b5060306046565b6040518082815260200191505060405180910390f35b60004790509056fea265627a7a72315820e8df844ac8ec94a632918e526a42713c7b6a94aaa983a935c4146d96a168eb5864736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.json
deleted file mode 100644
index a11cd0c73de4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToChild",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.bin
deleted file mode 100644
index 192c0219174c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061051d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063132245e81461003b578063de4787ae1461007f575b600080fd5b61007d6004803603602081101561005157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100c3565b005b6100c16004803603602081101561009557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061014d565b005b60006100ce826101d7565b9050601660030b8114610149576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f546f6b656e20756e7061757365206661696c656421000000000000000000000081525060200191505060405180910390fd5b5050565b60006101588261035f565b9050601660030b81146101d3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260138152602001807f546f6b656e207061757365206661696c6564210000000000000000000000000081525060200191505060405180910390fd5b5050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b85604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106102b45780518252602082019150602081019050602083039250610291565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610316576040519150601f19603f3d011682016040523d82523d6000602084013e61031b565b606091505b50915091508161032c576015610353565b80806020019051602081101561034157600080fd5b81019080805190602001909291905050505b60030b92505050919050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b85604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061043c5780518252602082019150602081019050602083039250610419565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461049e576040519150601f19603f3d011682016040523d82523d6000602084013e6104a3565b606091505b5091509150816104b45760156104db565b8080602001905160208110156104c957600080fd5b81019080805190602001909291905050505b60030b9250505091905056fea2646970667358221220a115328cffa148d268b8fed5bfedde6cc9df1e6a31d0a4d3aed432fa398c8b1264736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.json
deleted file mode 100644
index 251c761777a3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseTokenAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseTokenAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.bin
deleted file mode 100644
index 4c16c46d2adb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405261023a806100136000396000f3fe60806040526004361061003f5760003560e01c806312065fe01461008f5780633ccfd60b146100ba5780636f64234e146100d1578063b6b55f251461012c575b3373ffffffffffffffffffffffffffffffffffffffff167ff1b03f708b9c39f453fe3f0cef84164c7d6f7df836df0796e1e9c2bce6ee397e346040518082815260200191505060405180910390a2005b34801561009b57600080fd5b506100a461015a565b6040518082815260200191505060405180910390f35b3480156100c657600080fd5b506100cf610162565b005b3480156100dd57600080fd5b5061012a600480360360408110156100f457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506101ab565b005b6101586004803603602081101561014257600080fd5b81019080803590602001909291905050506101f6565b005b600047905090565b3373ffffffffffffffffffffffffffffffffffffffff166108fc479081150290604051600060405180830381858888f193505050501580156101a8573d6000803e3d6000fd5b50565b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156101f1573d6000803e3d6000fd5b505050565b80341461020257600080fd5b5056fea265627a7a72315820f8f84fc31a845064b5781e908316f3c591157962deabb0fd424ed54f256400f964736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.json
deleted file mode 100644
index b74e0698deaf..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.json
+++ /dev/null
@@ -1,91 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "_from",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "TransferReceived",
-    "type": "event"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getBalance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "sendFunds",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "withdraw",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.bin
deleted file mode 100644
index 22dc1c2695f6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610339806100206000396000f3fe608060405260043610610072576000357c01000000000000000000000000000000000000000000000000000000009004806312065fe0146100775780633ccfd60b146100a25780636f64234e146100b95780638142e8f6146101145780639b96eece14610165578063b6b55f25146101ca575b600080fd5b34801561008357600080fd5b5061008c6101f8565b6040518082815260200191505060405180910390f35b3480156100ae57600080fd5b506100b7610217565b005b3480156100c557600080fd5b50610112600480360360408110156100dc57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610277565b005b34801561012057600080fd5b506101636004803603602081101561013757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102c2565b005b34801561017157600080fd5b506101b46004803603602081101561018857600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506102db565b6040518082815260200191505060405180910390f35b6101f6600480360360208110156101e057600080fd5b81019080803590602001909291905050506102fc565b005b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b3373ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051600060405180830381858888f19350505050158015610274573d6000803e3d6000fd5b50565b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156102bd573d6000803e3d6000fd5b505050565b8073ffffffffffffffffffffffffffffffffffffffff16ff5b60008173ffffffffffffffffffffffffffffffffffffffff16319050919050565b803414151561030a57600080fd5b5056fea165627a7a7230582021c4b57195268ff0ce1e90b08c7e91be4184209933ff4e70b62e69d389568d9a0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.json
deleted file mode 100644
index d4269eb5e436..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayTestSelfDestruct/PayTestSelfDestruct.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getBalance",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "killMe",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.bin
deleted file mode 100644
index 32c7eb0b23c4..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052603e8060116000396000f3fe6080604052600080fdfea265627a7a723158204be1c10b97f2e7e00079115200c21ebf2c15c8eda66596685150cd6f5356464664736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.json
deleted file mode 100644
index 7492e8c3010c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.bin
deleted file mode 100644
index 1bb2a748e27e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600f57600080fd5b5060f48061001e6000396000f3fe608060405260043610601c5760003560e01c80636fb29798146021575b600080fd5b60276029565b005b6000604051806020016039906063565b6020820181038252601f19601f8201166040525090503381516020830134f5606057600080fd5b50565b605080606f8339019056fe6080604052603f8060116000396000f3fe6080604052600080fdfea2646970667358221220bbe7c927bf1313340ec68bb743e3034100d71c2744148a4f355cdcbdb2c48a3764736f6c63430008070033a264697066735822122094aea78029fcdd0db418a0d931d4aa01672b6a9d6cfb90dc25251f05bd253aaa64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.json
deleted file mode 100644
index 5708ab1af519..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "testPayableCreate",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.bin
deleted file mode 100644
index 70b0d70e4ead..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161001d9061007e565b604051809103906000f080158015610039573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061008b565b61143280611af883390190565b611a5e8061009a6000396000f3fe608060405234801561001057600080fd5b50600436106101005760003560e01c80637e8d603411610097578063c3d6e94911610066578063c3d6e94914610291578063d005f06d146102ad578063d0c0c409146102c9578063eac6f3fe146102e557610100565b80637e8d60341461020d5780639b23d3d914610229578063b1aa409b14610259578063bd196de91461027557610100565b80632fca6280116100d35780632fca62801461019d5780635051fab0146101b95780636268fe9e146101d557806362f7dcc6146101f157610100565b806311e1fc07146101055780631338df4d1461013557806315dacbea146101515780631b5e8b4514610181575b600080fd5b61011f600480360381019061011a9190610fc3565b610315565b60405161012c9190611046565b60405180910390f35b61014f600480360381019061014a91906112a9565b610431565b005b61016b60048036038101906101669190610fc3565b6104d2565b6040516101789190611046565b60405180910390f35b61019b60048036038101906101969190611364565b6105f0565b005b6101b760048036038101906101b29190611364565b610601565b005b6101d360048036038101906101ce919061141f565b610614565b005b6101ef60048036038101906101ea91906114aa565b610624565b005b61020b600480360381019061020691906114aa565b610637565b005b610227600480360381019061022291906114aa565b610648565b005b610243600480360381019061023e9190610fc3565b610659565b6040516102509190611046565b60405180910390f35b610273600480360381019061026e9190611511565b610777565b005b61028f600480360381019061028a9190611511565b61081c565b005b6102ab60048036038101906102a6919061141f565b6108c1565b005b6102c760048036038101906102c2919061158c565b6108d2565b005b6102e360048036038101906102de91906114aa565b610977565b005b6102ff60048036038101906102fa9190610fc3565b61098a565b60405161030c9190611046565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016103529493929190611695565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103bc919061174b565b600060405180830381855af49150503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50915091508161040d576015610422565b80806020019051810190610421919061179b565b5b60030b92505050949350505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663c3d6e9498585856040518463ffffffff1660e01b815260040161048e93929190611944565b600060405180830381600087803b1580156104a857600080fd5b505af11580156104bc573d6000803e3d6000fd5b505050506104cb848483610aa6565b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b8888888860405160240161050f9493929190611695565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610579919061174b565b6000604051808303816000865af19150503d80600081146105b6576040519150601f19603f3d011682016040523d82523d6000602084013e6105bb565b606091505b5091509150816105cc5760156105e1565b808060200190518101906105e0919061179b565b5b60030b92505050949350505050565b6105fc84848484610bc1565b600080fd5b61060d84848484610bc1565b5050505050565b61061f838383610aa6565b600080fd5b61063084848484610cdf565b5050505050565b61064384848484610dfd565b600080fd5b61065484848484610cdf565b600080fd5b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016106969493929190611695565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610700919061174b565b6000604051808303816000865af19150503d806000811461073d576040519150601f19603f3d011682016040523d82523d6000602084013e610742565b606091505b509150915081610753576015610768565b80806020019051810190610767919061179b565b5b60030b92505050949350505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16636268fe9e868686866040518563ffffffff1660e01b81526004016107d69493929190611989565b600060405180830381600087803b1580156107f057600080fd5b505af1158015610804573d6000803e3d6000fd5b5050505061081485858584610cdf565b505050505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d0c0c409868686866040518563ffffffff1660e01b815260040161087b9493929190611989565b600060405180830381600087803b15801561089557600080fd5b505af11580156108a9573d6000803e3d6000fd5b505050506108b985858584610dfd565b505050505050565b6108cc838383610aa6565b50505050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16632fca6280868686866040518563ffffffff1660e01b815260040161093194939291906119ce565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b5050505061096f85858584610bc1565b505050505050565b61098384848484610dfd565b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016109c79493929190611695565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a31919061174b565b600060405180830381855af49150503d8060008114610a6c576040519150601f19603f3d011682016040523d82523d6000602084013e610a71565b606091505b509150915081610a82576015610a97565b80806020019051810190610a96919061179b565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b878787604051602401610ae193929190611944565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b4b919061174b565b6000604051808303816000865af19150503d8060008114610b88576040519150601f19603f3d011682016040523d82523d6000602084013e610b8d565b606091505b509150915081610b9e576015610bb3565b80806020019051810190610bb2919061179b565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b88888888604051602401610bfe94939291906119ce565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610c68919061174b565b6000604051808303816000865af19150503d8060008114610ca5576040519150601f19603f3d011682016040523d82523d6000602084013e610caa565b606091505b509150915081610cbb576015610cd0565b80806020019051810190610ccf919061179b565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b88888888604051602401610d1c9493929190611989565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610d86919061174b565b6000604051808303816000865af19150503d8060008114610dc3576040519150601f19603f3d011682016040523d82523d6000602084013e610dc8565b606091505b509150915081610dd9576015610dee565b80806020019051810190610ded919061179b565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b88888888604051602401610e3a9493929190611989565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610ea4919061174b565b6000604051808303816000865af19150503d8060008114610ee1576040519150601f19603f3d011682016040523d82523d6000602084013e610ee6565b606091505b509150915081610ef7576015610f0c565b80806020019051810190610f0b919061179b565b5b60030b92505050949350505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610f5a82610f2f565b9050919050565b610f6a81610f4f565b8114610f7557600080fd5b50565b600081359050610f8781610f61565b92915050565b6000819050919050565b610fa081610f8d565b8114610fab57600080fd5b50565b600081359050610fbd81610f97565b92915050565b60008060008060808587031215610fdd57610fdc610f25565b5b6000610feb87828801610f78565b9450506020610ffc87828801610f78565b935050604061100d87828801610f78565b925050606061101e87828801610fae565b91505092959194509250565b60008160070b9050919050565b6110408161102a565b82525050565b600060208201905061105b6000830184611037565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6110af82611066565b810181811067ffffffffffffffff821117156110ce576110cd611077565b5b80604052505050565b60006110e1610f1b565b90506110ed82826110a6565b919050565b600067ffffffffffffffff82111561110d5761110c611077565b5b602082029050602081019050919050565b600080fd5b6000611136611131846110f2565b6110d7565b905080838252602082019050602084028301858111156111595761115861111e565b5b835b81811015611182578061116e8882610f78565b84526020840193505060208101905061115b565b5050509392505050565b600082601f8301126111a1576111a0611061565b5b81356111b1848260208601611123565b91505092915050565b600067ffffffffffffffff8211156111d5576111d4611077565b5b602082029050602081019050919050565b6111ef8161102a565b81146111fa57600080fd5b50565b60008135905061120c816111e6565b92915050565b6000611225611220846111ba565b6110d7565b905080838252602082019050602084028301858111156112485761124761111e565b5b835b81811015611271578061125d88826111fd565b84526020840193505060208101905061124a565b5050509392505050565b600082601f8301126112905761128f611061565b5b81356112a0848260208601611212565b91505092915050565b600080600080608085870312156112c3576112c2610f25565b5b60006112d187828801610f78565b945050602085013567ffffffffffffffff8111156112f2576112f1610f2a565b5b6112fe8782880161118c565b935050604085013567ffffffffffffffff81111561131f5761131e610f2a565b5b61132b8782880161127b565b925050606085013567ffffffffffffffff81111561134c5761134b610f2a565b5b6113588782880161127b565b91505092959194509250565b6000806000806080858703121561137e5761137d610f25565b5b600061138c87828801610f78565b945050602085013567ffffffffffffffff8111156113ad576113ac610f2a565b5b6113b98782880161118c565b935050604085013567ffffffffffffffff8111156113da576113d9610f2a565b5b6113e68782880161118c565b925050606085013567ffffffffffffffff81111561140757611406610f2a565b5b6114138782880161127b565b91505092959194509250565b60008060006060848603121561143857611437610f25565b5b600061144686828701610f78565b935050602084013567ffffffffffffffff81111561146757611466610f2a565b5b6114738682870161118c565b925050604084013567ffffffffffffffff81111561149457611493610f2a565b5b6114a08682870161127b565b9150509250925092565b600080600080608085870312156114c4576114c3610f25565b5b60006114d287828801610f78565b94505060206114e387828801610f78565b93505060406114f487828801610f78565b9250506060611505878288016111fd565b91505092959194509250565b600080600080600060a0868803121561152d5761152c610f25565b5b600061153b88828901610f78565b955050602061154c88828901610f78565b945050604061155d88828901610f78565b935050606061156e888289016111fd565b925050608061157f888289016111fd565b9150509295509295909350565b600080600080600060a086880312156115a8576115a7610f25565b5b60006115b688828901610f78565b955050602086013567ffffffffffffffff8111156115d7576115d6610f2a565b5b6115e38882890161118c565b945050604086013567ffffffffffffffff81111561160457611603610f2a565b5b6116108882890161118c565b935050606086013567ffffffffffffffff81111561163157611630610f2a565b5b61163d8882890161127b565b925050608086013567ffffffffffffffff81111561165e5761165d610f2a565b5b61166a8882890161127b565b9150509295509295909350565b61168081610f4f565b82525050565b61168f81610f8d565b82525050565b60006080820190506116aa6000830187611677565b6116b76020830186611677565b6116c46040830185611677565b6116d16060830184611686565b95945050505050565b600081519050919050565b600081905092915050565b60005b8381101561170e5780820151818401526020810190506116f3565b60008484015250505050565b6000611725826116da565b61172f81856116e5565b935061173f8185602086016116f0565b80840191505092915050565b6000611757828461171a565b915081905092915050565b60008160030b9050919050565b61177881611762565b811461178357600080fd5b50565b6000815190506117958161176f565b92915050565b6000602082840312156117b1576117b0610f25565b5b60006117bf84828501611786565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6117fd81610f4f565b82525050565b600061180f83836117f4565b60208301905092915050565b6000602082019050919050565b6000611833826117c8565b61183d81856117d3565b9350611848836117e4565b8060005b838110156118795781516118608882611803565b975061186b8361181b565b92505060018101905061184c565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6118bb8161102a565b82525050565b60006118cd83836118b2565b60208301905092915050565b6000602082019050919050565b60006118f182611886565b6118fb8185611891565b9350611906836118a2565b8060005b8381101561193757815161191e88826118c1565b9750611929836118d9565b92505060018101905061190a565b5085935050505092915050565b60006060820190506119596000830186611677565b818103602083015261196b8185611828565b9050818103604083015261197f81846118e6565b9050949350505050565b600060808201905061199e6000830187611677565b6119ab6020830186611677565b6119b86040830185611677565b6119c56060830184611037565b95945050505050565b60006080820190506119e36000830187611677565b81810360208301526119f58186611828565b90508181036040830152611a098185611828565b90508181036060830152611a1d81846118e6565b90509594505050505056fea26469706673582212200f5d79303d161a98227573cbf68ee9a6a5541e0b07ee53d57383f893f6d6a55764736f6c63430008100033608060405234801561001057600080fd5b50611412806100206000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80639b23d3d91161005b5780639b23d3d914610125578063c3d6e94914610155578063d0c0c40914610171578063eac6f3fe1461018d57610088565b806311e1fc071461008d57806315dacbea146100bd5780632fca6280146100ed5780636268fe9e14610109575b600080fd5b6100a760048036038101906100a29190610b98565b6101bd565b6040516100b49190610c1b565b60405180910390f35b6100d760048036038101906100d29190610b98565b6102d9565b6040516100e49190610c1b565b60405180910390f35b61010760048036038101906101029190610e7e565b6103f7565b005b610123600480360381019061011e9190610f39565b61040a565b005b61013f600480360381019061013a9190610b98565b61041d565b60405161014c9190610c1b565b60405180910390f35b61016f600480360381019061016a9190610fa0565b61053b565b005b61018b60048036038101906101869190610f39565b61054c565b005b6101a760048036038101906101a29190610b98565b61055f565b6040516101b49190610c1b565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016101fa9493929190611049565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161026491906110ff565b600060405180830381855af49150503d806000811461029f576040519150601f19603f3d011682016040523d82523d6000602084013e6102a4565b606091505b5091509150816102b55760156102ca565b808060200190518101906102c9919061114f565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016103169493929190611049565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161038091906110ff565b6000604051808303816000865af19150503d80600081146103bd576040519150601f19603f3d011682016040523d82523d6000602084013e6103c2565b606091505b5091509150816103d35760156103e8565b808060200190518101906103e7919061114f565b5b60030b92505050949350505050565b6104038484848461067b565b5050505050565b61041684848484610799565b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b8888888860405160240161045a9493929190611049565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104c491906110ff565b6000604051808303816000865af19150503d8060008114610501576040519150601f19603f3d011682016040523d82523d6000602084013e610506565b606091505b50915091508161051757601561052c565b8080602001905181019061052b919061114f565b5b60030b92505050949350505050565b6105468383836108b7565b50505050565b610558848484846109d2565b5050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b8888888860405160240161059c9493929190611049565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161060691906110ff565b600060405180830381855af49150503d8060008114610641576040519150601f19603f3d011682016040523d82523d6000602084013e610646565b606091505b50915091508161065757601561066c565b8080602001905181019061066b919061114f565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b888888886040516024016106b894939291906112f8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161072291906110ff565b6000604051808303816000865af19150503d806000811461075f576040519150601f19603f3d011682016040523d82523d6000602084013e610764565b606091505b50915091508161077557601561078a565b80806020019051810190610789919061114f565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016107d69493929190611352565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161084091906110ff565b6000604051808303816000865af19150503d806000811461087d576040519150601f19603f3d011682016040523d82523d6000602084013e610882565b606091505b5091509150816108935760156108a8565b808060200190518101906108a7919061114f565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b8787876040516024016108f293929190611397565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161095c91906110ff565b6000604051808303816000865af19150503d8060008114610999576040519150601f19603f3d011682016040523d82523d6000602084013e61099e565b606091505b5091509150816109af5760156109c4565b808060200190518101906109c3919061114f565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b88888888604051602401610a0f9493929190611352565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a7991906110ff565b6000604051808303816000865af19150503d8060008114610ab6576040519150601f19603f3d011682016040523d82523d6000602084013e610abb565b606091505b509150915081610acc576015610ae1565b80806020019051810190610ae0919061114f565b5b60030b92505050949350505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610b2f82610b04565b9050919050565b610b3f81610b24565b8114610b4a57600080fd5b50565b600081359050610b5c81610b36565b92915050565b6000819050919050565b610b7581610b62565b8114610b8057600080fd5b50565b600081359050610b9281610b6c565b92915050565b60008060008060808587031215610bb257610bb1610afa565b5b6000610bc087828801610b4d565b9450506020610bd187828801610b4d565b9350506040610be287828801610b4d565b9250506060610bf387828801610b83565b91505092959194509250565b60008160070b9050919050565b610c1581610bff565b82525050565b6000602082019050610c306000830184610c0c565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610c8482610c3b565b810181811067ffffffffffffffff82111715610ca357610ca2610c4c565b5b80604052505050565b6000610cb6610af0565b9050610cc28282610c7b565b919050565b600067ffffffffffffffff821115610ce257610ce1610c4c565b5b602082029050602081019050919050565b600080fd5b6000610d0b610d0684610cc7565b610cac565b90508083825260208201905060208402830185811115610d2e57610d2d610cf3565b5b835b81811015610d575780610d438882610b4d565b845260208401935050602081019050610d30565b5050509392505050565b600082601f830112610d7657610d75610c36565b5b8135610d86848260208601610cf8565b91505092915050565b600067ffffffffffffffff821115610daa57610da9610c4c565b5b602082029050602081019050919050565b610dc481610bff565b8114610dcf57600080fd5b50565b600081359050610de181610dbb565b92915050565b6000610dfa610df584610d8f565b610cac565b90508083825260208201905060208402830185811115610e1d57610e1c610cf3565b5b835b81811015610e465780610e328882610dd2565b845260208401935050602081019050610e1f565b5050509392505050565b600082601f830112610e6557610e64610c36565b5b8135610e75848260208601610de7565b91505092915050565b60008060008060808587031215610e9857610e97610afa565b5b6000610ea687828801610b4d565b945050602085013567ffffffffffffffff811115610ec757610ec6610aff565b5b610ed387828801610d61565b935050604085013567ffffffffffffffff811115610ef457610ef3610aff565b5b610f0087828801610d61565b925050606085013567ffffffffffffffff811115610f2157610f20610aff565b5b610f2d87828801610e50565b91505092959194509250565b60008060008060808587031215610f5357610f52610afa565b5b6000610f6187828801610b4d565b9450506020610f7287828801610b4d565b9350506040610f8387828801610b4d565b9250506060610f9487828801610dd2565b91505092959194509250565b600080600060608486031215610fb957610fb8610afa565b5b6000610fc786828701610b4d565b935050602084013567ffffffffffffffff811115610fe857610fe7610aff565b5b610ff486828701610d61565b925050604084013567ffffffffffffffff81111561101557611014610aff565b5b61102186828701610e50565b9150509250925092565b61103481610b24565b82525050565b61104381610b62565b82525050565b600060808201905061105e600083018761102b565b61106b602083018661102b565b611078604083018561102b565b611085606083018461103a565b95945050505050565b600081519050919050565b600081905092915050565b60005b838110156110c25780820151818401526020810190506110a7565b60008484015250505050565b60006110d98261108e565b6110e38185611099565b93506110f38185602086016110a4565b80840191505092915050565b600061110b82846110ce565b915081905092915050565b60008160030b9050919050565b61112c81611116565b811461113757600080fd5b50565b60008151905061114981611123565b92915050565b60006020828403121561116557611164610afa565b5b60006111738482850161113a565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6111b181610b24565b82525050565b60006111c383836111a8565b60208301905092915050565b6000602082019050919050565b60006111e78261117c565b6111f18185611187565b93506111fc83611198565b8060005b8381101561122d57815161121488826111b7565b975061121f836111cf565b925050600181019050611200565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61126f81610bff565b82525050565b60006112818383611266565b60208301905092915050565b6000602082019050919050565b60006112a58261123a565b6112af8185611245565b93506112ba83611256565b8060005b838110156112eb5781516112d28882611275565b97506112dd8361128d565b9250506001810190506112be565b5085935050505092915050565b600060808201905061130d600083018761102b565b818103602083015261131f81866111dc565b9050818103604083015261133381856111dc565b90508181036060830152611347818461129a565b905095945050505050565b6000608082019050611367600083018761102b565b611374602083018661102b565b611381604083018561102b565b61138e6060830184610c0c565b95945050505050565b60006060820190506113ac600083018661102b565b81810360208301526113be81856111dc565b905081810360408301526113d2818461129a565b905094935050505056fea26469706673582212206f15c89219fe6264bbe5f06142acd79646596dc7a519b4ebb18131570688b82964736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.json
deleted file mode 100644
index cc90a6ed47c8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"delegateTransferFrom","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"serialNumber","type":"uint256"}],"name":"delegateTransferFromNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"serialNumber","type":"uint256"}],"name":"transferFromNFT","outputs":[{"internalType":"int64","name":"responseCode","type":"int64"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"serialNum","type":"int64"}],"name":"transferNFTCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"serialNum","type":"int64"},{"internalType":"int64","name":"serialNum2","type":"int64"}],"name":"transferNFTCallNestedThenAgain","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"serialNum","type":"int64"}],"name":"transferNFTThanRevertCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"sender","type":"address[]"},{"internalType":"address[]","name":"receiver","type":"address[]"},{"internalType":"int64[]","name":"serialNumber","type":"int64[]"}],"name":"transferNFTsCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"sender","type":"address[]"},{"internalType":"address[]","name":"receiver","type":"address[]"},{"internalType":"int64[]","name":"serialNumber","type":"int64[]"},{"internalType":"int64[]","name":"serialNumber2","type":"int64[]"}],"name":"transferNFTsCallNestedThenAgain","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"sender","type":"address[]"},{"internalType":"address[]","name":"receiver","type":"address[]"},{"internalType":"int64[]","name":"serialNumber","type":"int64[]"}],"name":"transferNFTsThanRevertCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"amount","type":"int64"}],"name":"transferTokenCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"amount","type":"int64"},{"internalType":"int64","name":"amount2","type":"int64"}],"name":"transferTokenCallNestedThenAgain","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"receiver","type":"address"},{"internalType":"int64","name":"amount","type":"int64"}],"name":"transferTokenThanRevertCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"accountIds","type":"address[]"},{"internalType":"int64[]","name":"amounts","type":"int64[]"}],"name":"transferTokensCall","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"accountIds","type":"address[]"},{"internalType":"int64[]","name":"amounts","type":"int64[]"},{"internalType":"int64[]","name":"amounts2","type":"int64[]"}],"name":"transferTokensCallNestedThenAgain","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address[]","name":"accountIds","type":"address[]"},{"internalType":"int64[]","name":"amounts","type":"int64[]"}],"name":"transferTokensThanRevertCall","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.bin
deleted file mode 100644
index a5763302ecde..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506111b8806100206000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80638f8d7f99116100665780638f8d7f9914610136578063af99c63314610149578063d614cdb81461015c578063e66a629f1461017d578063f2c31ff4146101a757600080fd5b80633b3bff0f146100a35780633c4dd32e146100c9578063593d6e82146100ea5780636fc3cbaf146100fd5780637c41ad2c14610123575b600080fd5b6100b66100b136600461090f565b6101d4565b6040519081526020015b60405180910390f35b6100dc6100d7366004610933565b6102ae565b6040516100c0929190610a26565b6100b66100f8366004610b12565b610395565b61011061010b366004610c1b565b610472565b60405160079190910b81526020016100c0565b6100b661013136600461090f565b61049e565b610110610144366004610ddc565b6104cc565b610110610157366004610ddc565b610502565b61016f61016a36600461090f565b610538565b6040516100c0929190610e15565b61019061018b366004610e4f565b610642565b6040805192151583526020830191909152016100c0565b6101ba6101b5366004610ddc565b610705565b6040805160079390930b83529015156020830152016100c0565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161023c9190610e96565b6000604051808303816000865af19150503d8060008114610279576040519150601f19603f3d011682016040523d82523d6000602084013e61027e565b606091505b50915091508161028f5760156102a3565b808060200190518101906102a39190610ec4565b60030b949350505050565b60006102b86108a4565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b179052905160009182916101679161031291610e96565b6000604051808303816000865af19150503d806000811461034f576040519150601f19603f3d011682016040523d82523d6000602084013e610354565b606091505b50915091506103616108a4565b8261036e57601581610382565b818060200190518101906103829190610f2f565b60039190910b9890975095505050505050565b60008060006101676001600160a01b031663593d6e8260e01b86866040516024016103c192919061100a565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516103ff9190610e96565b6000604051808303816000865af19150503d806000811461043c576040519150601f19603f3d011682016040523d82523d6000602084013e610441565b606091505b509150915081610452576015610466565b808060200190518101906104669190610ec4565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b86866040516024016103c192919061104d565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b906044016101fe565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b906064016103c1565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b906064016103c1565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b1790529251909283918291610167916105aa9190610e96565b6000604051808303816000865af19150503d80600081146105e7576040519150601f19603f3d011682016040523d82523d6000602084013e6105ec565b606091505b50604080516060810182526000808252602082018190529181019190915291935091508261061c57601581610630565b8180602001905181019061063091906110d2565b60039190910b97909650945050505050565b60008060006002856040516106579190610e96565b602060405180830381855afa158015610674573d6000803e3d6000fd5b5050506040513d601f19601f82011682018060405250810190610697919061113d565b90506000806106a5866107d0565b915060070b9150601660030b82146106f95760405162461bcd60e51b8152602060048201526013602482015272546f6b656e20636865636b206661696c65642160681b604482015260640160405180910390fd5b96919550909350505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b17905290516000918291829182916101679161076791610e96565b6000604051808303816000865af19150503d80600081146107a4576040519150601f19603f3d011682016040523d82523d6000602084013e6107a9565b606091505b5091509150816107bc5760156000610630565b808060200190518101906106309190611156565b604080516001600160a01b03831660248083019190915282518083039091018152604490910182526020810180516001600160e01b03166319f3736160e01b17905290516000918291829182916101679161082a91610e96565b6000604051808303816000865af19150503d8060008114610867576040519150601f19603f3d011682016040523d82523d6000602084013e61086c565b606091505b50915091508161087f5760156000610893565b808060200190518101906108939190611156565b60039190910b969095509350505050565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001600160a01b03811681146108fc57600080fd5b50565b803561090a816108e7565b919050565b60006020828403121561092157600080fd5b813561092c816108e7565b9392505050565b6000806040838503121561094657600080fd5b8235610951816108e7565b946020939093013593505050565b60005b8381101561097a578181015183820152602001610962565b83811115610989576000848401525b50505050565b600081518084526109a781602086016020860161095f565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a060408601526109f360a086018361098f565b915060608401518583036060870152610a0c838261098f565b925050806080850151166080860152508091505092915050565b8260070b8152604060208201526000610a4260408301846109bb565b949350505050565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff81118282101715610a8357610a83610a4a565b60405290565b6040805190810167ffffffffffffffff81118282101715610a8357610a83610a4a565b60405160a0810167ffffffffffffffff81118282101715610a8357610a83610a4a565b604051601f8201601f1916810167ffffffffffffffff81118282101715610af857610af8610a4a565b604052919050565b63ffffffff811681146108fc57600080fd5b6000808284036080811215610b2657600080fd5b8335610b31816108e7565b92506060601f1982011215610b4557600080fd5b50610b4e610a60565b6020840135610b5c81610b00565b81526040840135610b6c816108e7565b60208201526060840135610b7f81610b00565b6040820152919491935090915050565b80151581146108fc57600080fd5b600067ffffffffffffffff821115610bb757610bb7610a4a565b50601f01601f191660200190565b600082601f830112610bd657600080fd5b8135610be9610be482610b9d565b610acf565b818152846020838601011115610bfe57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610c2e57600080fd5b610c3883356108e7565b8235915067ffffffffffffffff8060208501351115610c5657600080fd5b6020840135840185601f820112610c6c57600080fd5b8181351115610c7d57610c7d610a4a565b610c8d6020823560051b01610acf565b81358082526020808301929160051b84010188811115610cac57600080fd5b602084015b81811015610dcd578581351115610cc757600080fd5b80358501601f196040828d0382011215610ce057600080fd5b610ce8610a89565b602083013581528860408401351115610d0057600080fd5b60408301358301925060a082848f03011215610d1b57600080fd5b610d23610aac565b9150610d326020840135610b8f565b60208301358252610d4660408401356108e7565b604083013560208301528860608401351115610d6157600080fd5b610d748d60206060860135860101610bc5565b60408301528860808401351115610d8a57600080fd5b610d9d8d60206080860135860101610bc5565b6060830152610dae60a084016108ff565b6080830152602081810192909252865294850194919091019050610cb1565b50959890975095505050505050565b60008060408385031215610def57600080fd5b8235610dfa816108e7565b91506020830135610e0a816108e7565b809150509250929050565b8281526080810161092c6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b60008060408385031215610e6257600080fd5b823567ffffffffffffffff811115610e7957600080fd5b610e8585828601610bc5565b9250506020830135610e0a816108e7565b60008251610ea881846020870161095f565b9190910192915050565b8051600381900b811461090a57600080fd5b600060208284031215610ed657600080fd5b61092c82610eb2565b805161090a816108e7565b600082601f830112610efb57600080fd5b8151610f09610be482610b9d565b818152846020838601011115610f1e57600080fd5b610a4282602083016020870161095f565b60008060408385031215610f4257600080fd5b610f4b83610eb2565b9150602083015167ffffffffffffffff80821115610f6857600080fd5b9084019060a08287031215610f7c57600080fd5b610f84610aac565b8251610f8f81610b8f565b81526020830151610f9f816108e7565b6020820152604083015182811115610fb657600080fd5b610fc288828601610eea565b604083015250606083015182811115610fda57600080fd5b610fe688828601610eea565b606083015250610ff860808401610edf565b60808201528093505050509250929050565b6001600160a01b03831681526080810161092c6020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b828110156110c357888603605f190184528151805187528501518587018890526110b0888801826109bb565b9650509284019290840190600101611084565b50939998505050505050505050565b60008082840360808112156110e657600080fd5b6110ef84610eb2565b92506060601f198201121561110357600080fd5b5061110c610a60565b602084015161111a81610b00565b8152604084015161112a816108e7565b60208201526060840151610b7f81610b00565b60006020828403121561114f57600080fd5b5051919050565b6000806040838503121561116957600080fd5b61117283610eb2565b91506020830151610e0a81610b8f56fea26469706673582212202f2f04041523934a8d7ddf861e2f64e35070d4bcae391a68a51f70307747be6a64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.json
deleted file mode 100644
index 49189ac7f62c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.json
+++ /dev/null
@@ -1,347 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "toHash",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "callSha256AndIsToken",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.bin
deleted file mode 100644
index 436e3883857e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526101676000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555034801561005257600080fd5b50610319806100626000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063efc3882614610030575b600080fd5b61004a600480360381019061004591906101bc565b61004c565b005b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b8383677fffffffffffffff6040516024016100a893929190610224565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161011291906102cc565b600060405180830381855af49150503d806000811461014d576040519150601f19603f3d011682016040523d82523d6000602084013e610152565b606091505b5050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101898261015e565b9050919050565b6101998161017e565b81146101a457600080fd5b50565b6000813590506101b681610190565b92915050565b600080604083850312156101d3576101d2610159565b5b60006101e1858286016101a7565b92505060206101f2858286016101a7565b9150509250929050565b6102058161017e565b82525050565b6000819050919050565b61021e8161020b565b82525050565b600060608201905061023960008301866101fc565b61024660208301856101fc565b6102536040830184610215565b949350505050565b600081519050919050565b600081905092915050565b60005b8381101561028f578082015181840152602081019050610274565b60008484015250505050565b60006102a68261025b565b6102b08185610266565b93506102c0818560208601610271565b80840191505092915050565b60006102d8828461029b565b91508190509291505056fea2646970667358221220f9befdccadc922564d436647f3e217d45e16b63e73144c6129c0aac6613a8e7c64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.json
deleted file mode 100644
index 3f1d6abe2b54..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "_token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_attacker",
-          "type": "address"
-        }
-      ],
-      "name": "doIndirectApproval",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.bin
deleted file mode 100644
index 7f433b2378ec..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506101e2806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063fa50ab2014610030575b600080fd5b61004a60048036038101906100459190610121565b61004c565b005b8273ffffffffffffffffffffffffffffffffffffffff1663efc3882683836040518363ffffffff1660e01b8152600401610087929190610183565b600060405180830381600087803b1580156100a157600080fd5b505af11580156100b5573d6000803e3d6000fd5b50505050505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100ee826100c3565b9050919050565b6100fe816100e3565b811461010957600080fd5b50565b60008135905061011b816100f5565b92915050565b60008060006060848603121561013a576101396100be565b5b60006101488682870161010c565b93505060206101598682870161010c565b925050604061016a8682870161010c565b9150509250925092565b61017d816100e3565b82525050565b60006040820190506101986000830185610174565b6101a56020830184610174565b939250505056fea2646970667358221220207f893e33e329ed980e411be7a3a0a8613fa1d1dff02b0037169b93bb0c710064736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.json
deleted file mode 100644
index 3fc8baba6e77..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "attacker",
-          "type": "address"
-        }
-      ],
-      "name": "callTo",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.bin
deleted file mode 100644
index 88c9121442fd..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060b88061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063d83bf9a114602d575b600080fd5b60336047565b604051603e91906069565b60405180910390f35b60004460001b905090565b6000819050919050565b6063816052565b82525050565b6000602082019050607c6000830184605c565b9291505056fea2646970667358221220362f1b2d1c4a3ec4886413b48ada6b185917eb3e3a02718020c9cdb184bd0de264736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.json
deleted file mode 100644
index 3c33569dbe1a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"name":"getPseudorandomSeed","outputs":[{"internalType":"bytes32","name":"randomBytes","type":"bytes32"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.bin
deleted file mode 100644
index d4cd33d77c39..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610204806100136000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80632d970bdc1461003b578063d83bf9a114610055575b600080fd5b61004361005d565b60405190815260200160405180910390f35b61004361010a565b60408051600481526024810182526020810180516001600160e01b031663d83bf9a160e01b1790529051600091829182916101699160019161009e91610186565b60006040518083038185875af1925050503d80600081146100db576040519150601f19603f3d011682016040523d82523d6000602084013e6100e0565b606091505b5091509150816100ef57600080fd5b8080602001905181019061010391906101b5565b9250505090565b60408051600481526024810182526020810180516001600160e01b031663d83bf9a160e01b179052905160009182918291610169916101499190610186565b6000604051808303816000865af19150503d80600081146100db576040519150601f19603f3d011682016040523d82523d6000602084013e6100e0565b6000825160005b818110156101a7576020818601810151858301520161018d565b506000920191825250919050565b6000602082840312156101c757600080fd5b505191905056fea2646970667358221220ec391ece1da75f04f7e62a6939f57b3f706fc6482c182abeeab4df0a98415e3a64736f6c63430008170033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.json
deleted file mode 100644
index e5e981d88928..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-	{
-		"inputs": [],
-		"stateMutability": "payable",
-		"type": "constructor"
-	},
-	{
-		"inputs": [],
-		"name": "getPseudorandomSeed",
-		"outputs": [
-			{
-				"internalType": "bytes32",
-				"name": "randomBytes",
-				"type": "bytes32"
-			}
-		],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [],
-		"name": "getPseudorandomSeedPayable",
-		"outputs": [
-			{
-				"internalType": "bytes32",
-				"name": "randomBytes",
-				"type": "bytes32"
-			}
-		],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	}
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.bin
deleted file mode 100644
index 0421f13e7bac..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061065f806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806315dacbea14610051578063618dc65e1461007c5780639b23d3d914610091578063c6c26c0c146100a4575b600080fd5b61006461005f3660046103f8565b6100c4565b60405160079190910b81526020015b60405180910390f35b61008f61008a366004610459565b6101b8565b005b61006461009f3660046103f8565b6102a6565b6100b76100b236600461051b565b6102eb565b6040516100739190610592565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161014391906105a5565b6000604051808303816000865af19150503d8060008114610180576040519150601f19603f3d011682016040523d82523d6000602084013e610185565b606091505b5091509150816101965760156101aa565b808060200190518101906101aa91906105c1565b60030b979650505050505050565b6000806101676001600160a01b031663618dc65e60e01b85856040516024016101e29291906105e4565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161022091906105a5565b6000604051808303816000865af19150503d806000811461025d576040519150601f19603f3d011682016040523d82523d6000602084013e610262565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc828260405161029892919061060e565b60405180910390a150505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a401610105565b604080516001600160a01b0383166024820152604481018290526000606480830182905283518084039091018152608490920183526020820180516001600160e01b03166330c6e32f60e11b17905291516060929182916101679161034f916105a5565b6000604051808303816000865af19150503d806000811461038c576040519150601f19603f3d011682016040523d82523d6000602084013e610391565b606091505b5091509150816103d55760405162461bcd60e51b815260206004820152600b60248201526a18d85b1b0819985a5b195960aa1b604482015260640160405180910390fd5b9392505050565b80356001600160a01b03811681146103f357600080fd5b919050565b6000806000806080858703121561040e57600080fd5b610417856103dc565b9350610425602086016103dc565b9250610433604086016103dc565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561046c57600080fd5b610475836103dc565b9150602083013567ffffffffffffffff8082111561049257600080fd5b818501915085601f8301126104a657600080fd5b8135818111156104b8576104b8610443565b604051601f8201601f19908116603f011681019083821181831017156104e0576104e0610443565b816040528281528860208487010111156104f957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561052d57600080fd5b6103d5826103dc565b60005b83811015610551578181015183820152602001610539565b83811115610560576000848401525b50505050565b6000815180845261057e816020860160208601610536565b601f01601f19169290920160200192915050565b6020815260006103d56020830184610566565b600082516105b7818460208701610536565b9190910192915050565b6000602082840312156105d357600080fd5b81518060030b81146103d557600080fd5b6001600160a01b03831681526040602082015260006106066040830184610566565b949350505050565b8215158152604060208201526000610606604083018461056656fea2646970667358221220cf2e012f92099179ed106317f81541ec82148b23b329a61aaf19d637817cdd7764736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.json
deleted file mode 100644
index ec05811322e0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.json
+++ /dev/null
@@ -1,126 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "sendNullSelector",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "result",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.bin
deleted file mode 100644
index 5b487191f11f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50611160806100206000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80637c41ad2c116100665780637c41ad2c146101435780638f8d7f9914610156578063af99c63314610169578063d614cdb81461017c578063f2c31ff41461019d57600080fd5b80633b3bff0f146100a35780633c4dd32e146100c957806353290b44146100ea578063593d6e821461010a5780636fc3cbaf1461011d575b600080fd5b6100b66100b13660046108ea565b6101ca565b6040519081526020015b60405180910390f35b6100dc6100d736600461090e565b6102a4565b6040516100c0929190610a01565b6100fd6100f8366004610a1d565b61038b565b6040516100c09190610a56565b6100b6610118366004610b31565b61043a565b61013061012b366004610c3a565b610517565b60405160079190910b81526020016100c0565b6100b66101513660046108ea565b610543565b610130610164366004610a1d565b610571565b610130610177366004610a1d565b6105a7565b61018f61018a3660046108ea565b6105dd565b6040516100c0929190610dfb565b6101b06101ab366004610a1d565b6106e7565b6040805160079390930b83529015156020830152016100c0565b6040516001600160a01b03821660248201526000908190819061016790633b3bff0f60e01b906044015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102329190610e35565b6000604051808303816000865af19150503d806000811461026f576040519150601f19603f3d011682016040523d82523d6000602084013e610274565b606091505b509150915081610285576015610299565b808060200190518101906102999190610e63565b60030b949350505050565b60006102ae61087f565b604080516001600160a01b0386166024820152604480820186905282518083039091018152606490910182526020810180516001600160e01b0316631e26e99760e11b179052905160009182916101679161030891610e35565b6000604051808303816000865af19150503d8060008114610345576040519150601f19603f3d011682016040523d82523d6000602084013e61034a565b606091505b509150915061035761087f565b8261036457601581610378565b818060200190518101906103789190610ece565b60039190910b9890975095505050505050565b604080516001600160a01b0383166024808301919091528251808303909101815260449091019091526020810180516001600160e01b03166370a0823160e01b17905260609060009081906103e19086906107b2565b9092509050601682146104325760405162461bcd60e51b8152602060048201526015602482015274151bdad95b881c99591a5c9958dd0819985a5b1959605a1b604482015260640160405180910390fd5b949350505050565b60008060006101676001600160a01b031663593d6e8260e01b8686604051602401610466929190610fa9565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516104a49190610e35565b6000604051808303816000865af19150503d80600081146104e1576040519150601f19603f3d011682016040523d82523d6000602084013e6104e6565b606091505b5091509150816104f757601561050b565b8080602001905181019061050b9190610e63565b60030b95945050505050565b60008060006101676001600160a01b0316636fc3cbaf60e01b8686604051602401610466929190610fec565b6040516001600160a01b03821660248201526000908190819061016790631f106b4b60e21b906044016101f4565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b90606401610466565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063af99c63360e01b90606401610466565b604080516060810182526000808252602080830182905282840182905283516001600160a01b038616602480830191909152855180830390910181526044909101855290810180516001600160e01b0316631ac299b760e31b17905292519092839182916101679161064f9190610e35565b6000604051808303816000865af19150503d806000811461068c576040519150601f19603f3d011682016040523d82523d6000602084013e610691565b606091505b5060408051606081018252600080825260208201819052918101919091529193509150826106c1576015816106d5565b818060200190518101906106d59190611071565b60039190910b97909650945050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b0316633cb0c7fd60e21b17905290516000918291829182916101679161074991610e35565b6000604051808303816000865af19150503d8060008114610786576040519150601f19603f3d011682016040523d82523d6000602084013e61078b565b606091505b50915091508161079e57601560006106d5565b808060200190518101906106d591906110dc565b600060606000806101676001600160a01b031663618dc65e60e01b87876040516024016107e0929190611108565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161081e9190610e35565b6000604051808303816000865af19150503d806000811461085b576040519150601f19603f3d011682016040523d82523d6000602084013e610860565b606091505b509150915081610872576015816106d5565b6016969095509350505050565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001600160a01b03811681146108d757600080fd5b50565b80356108e5816108c2565b919050565b6000602082840312156108fc57600080fd5b8135610907816108c2565b9392505050565b6000806040838503121561092157600080fd5b823561092c816108c2565b946020939093013593505050565b60005b8381101561095557818101518382015260200161093d565b83811115610964576000848401525b50505050565b6000815180845261098281602086016020860161093a565b601f01601f19169290920160200192915050565b805115158252600060208201516001600160a01b0380821660208601526040840151915060a060408601526109ce60a086018361096a565b9150606084015185830360608701526109e7838261096a565b925050806080850151166080860152508091505092915050565b8260070b81526040602082015260006104326040830184610996565b60008060408385031215610a3057600080fd5b8235610a3b816108c2565b91506020830135610a4b816108c2565b809150509250929050565b602081526000610907602083018461096a565b634e487b7160e01b600052604160045260246000fd5b6040516060810167ffffffffffffffff81118282101715610aa257610aa2610a69565b60405290565b6040805190810167ffffffffffffffff81118282101715610aa257610aa2610a69565b60405160a0810167ffffffffffffffff81118282101715610aa257610aa2610a69565b604051601f8201601f1916810167ffffffffffffffff81118282101715610b1757610b17610a69565b604052919050565b63ffffffff811681146108d757600080fd5b6000808284036080811215610b4557600080fd5b8335610b50816108c2565b92506060601f1982011215610b6457600080fd5b50610b6d610a7f565b6020840135610b7b81610b1f565b81526040840135610b8b816108c2565b60208201526060840135610b9e81610b1f565b6040820152919491935090915050565b80151581146108d757600080fd5b600067ffffffffffffffff821115610bd657610bd6610a69565b50601f01601f191660200190565b600082601f830112610bf557600080fd5b8135610c08610c0382610bbc565b610aee565b818152846020838601011115610c1d57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060408385031215610c4d57600080fd5b610c5783356108c2565b8235915067ffffffffffffffff8060208501351115610c7557600080fd5b6020840135840185601f820112610c8b57600080fd5b8181351115610c9c57610c9c610a69565b610cac6020823560051b01610aee565b81358082526020808301929160051b84010188811115610ccb57600080fd5b602084015b81811015610dec578581351115610ce657600080fd5b80358501601f196040828d0382011215610cff57600080fd5b610d07610aa8565b602083013581528860408401351115610d1f57600080fd5b60408301358301925060a082848f03011215610d3a57600080fd5b610d42610acb565b9150610d516020840135610bae565b60208301358252610d6560408401356108c2565b604083013560208301528860608401351115610d8057600080fd5b610d938d60206060860135860101610be4565b60408301528860808401351115610da957600080fd5b610dbc8d60206080860135860101610be4565b6060830152610dcd60a084016108da565b6080830152602081810192909252865294850194919091019050610cd0565b50959890975095505050505050565b828152608081016109076020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b60008251610e4781846020870161093a565b9190910192915050565b8051600381900b81146108e557600080fd5b600060208284031215610e7557600080fd5b61090782610e51565b80516108e5816108c2565b600082601f830112610e9a57600080fd5b8151610ea8610c0382610bbc565b818152846020838601011115610ebd57600080fd5b61043282602083016020870161093a565b60008060408385031215610ee157600080fd5b610eea83610e51565b9150602083015167ffffffffffffffff80821115610f0757600080fd5b9084019060a08287031215610f1b57600080fd5b610f23610acb565b8251610f2e81610bae565b81526020830151610f3e816108c2565b6020820152604083015182811115610f5557600080fd5b610f6188828601610e89565b604083015250606083015182811115610f7957600080fd5b610f8588828601610e89565b606083015250610f9760808401610e7e565b60808201528093505050509250929050565b6001600160a01b0383168152608081016109076020830184805163ffffffff90811683526020808301516001600160a01b03169084015260409182015116910152565b600060408083016001600160a01b03861684526020828186015281865180845260608701915060608160051b880101935082880160005b8281101561106257888603605f1901845281518051875285015185870188905261104f88880182610996565b9650509284019290840190600101611023565b50939998505050505050505050565b600080828403608081121561108557600080fd5b61108e84610e51565b92506060601f19820112156110a257600080fd5b506110ab610a7f565b60208401516110b981610b1f565b815260408401516110c9816108c2565b60208201526060840151610b9e81610b1f565b600080604083850312156110ef57600080fd5b6110f883610e51565b91506020830151610a4b81610bae565b6001600160a01b0383168152604060208201526000610432604083018461096a56fea2646970667358221220c12a726ed4f57be15ae1b471d30a2edc6c75475bcfe7e8e87b906565d0e8423a64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.json
deleted file mode 100644
index 40e6345e10e3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.json
+++ /dev/null
@@ -1,342 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "getBalanceOf",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "result",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.bin
deleted file mode 100644
index bd57b1b5165b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506101bd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630b7113fc1461003b578063807dcda614610059575b600080fd5b610043610063565b6040516100509190610110565b60405180910390f35b61006161006b565b005b600030905090565b604051610077906100d5565b604051809103906000f080158015610093573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b605c8061012c83390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b61010a816100e1565b82525050565b60006020820190506101256000830184610101565b9291505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea2646970667358221220a6862110d574f1329bdac8d27761bf75640b6a20c1f887119819404b7527f25364736f6c634300080c0033a26469706673582212205d39b97ebd27cdfab7bcf38dad0c6b2f5a4a3a49bf4f2a5987fc6bc41c2a1dd164736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.json
deleted file mode 100644
index 8f7960837564..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "createPlaceholder",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "returnThis",
-    "outputs": [
-      {
-        "internalType": "uint160",
-        "name": "",
-        "type": "uint160"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.bin
deleted file mode 100644
index 77d04f83b3a6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b5f80fdfe
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.json
deleted file mode 100644
index b9a2575bb60b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.bin
deleted file mode 100644
index 1327b73d5de1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523373ffffffffffffffffffffffffffffffffffffffff166108fc600190811502906040515f60405180830381858888f193505050501580156047573d5f803e3d5ffd5b50603e8060535f395ff3fe60806040525f80fdfea2646970667358221220f7a4b5b518a591095ab2a37161bfdd9bde65cfb7d6b46b636b9f36c66446c72364736f6c63430008180033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.json
deleted file mode 100644
index 5fa856267a8b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.bin
deleted file mode 100644
index c69032491f8c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161031038038061031083398101604081905261002f91610043565b600581101561003d57600080fd5b5061005c565b60006020828403121561005557600080fd5b5051919050565b6102a58061006b6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80638bec7c7b146100465780639db8d7d514610050578063bfc2e3d514610063575b600080fd5b61004e610074565b005b61004e61005e366004610187565b61014c565b61004e610071366004610187565b50565b60405160ea6024820152600090604401604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fbfc2e3d5000000000000000000000000000000000000000000000000000000001790525161010591906101a0565b6000604051808303816000865af19150503d8060008114610142576040519150601f19603f3d011682016040523d82523d6000602084013e505050565b606091505b505050565b806040516101599061017b565b908152602001604051809103906000f080158015610147573d6000803e3d6000fd5b60a0806101d083390190565b60006020828403121561019957600080fd5b5035919050565b6000825160005b818110156101c157602081860181015185830152016101a7565b50600092019182525091905056fe6080604052348015600f57600080fd5b5060405160a038038060a0833981016040819052602a91603c565b6005811015603757600080fd5b506054565b600060208284031215604d57600080fd5b5051919050565b603f8060616000396000f3fe6080604052600080fdfea26469706673582212203a78fad9b58829450516961778fc87bd48625073d994d7a5ef1ae787794f7ec364736f6c63430008100033a2646970667358221220160af4c2937705592720659a320f515b1d550a82f1a6d10a1c7d05c10a93928a64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.json
deleted file mode 100644
index df47ccfe9da5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_range",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_value",
-        "type": "uint256"
-      }
-    ],
-    "name": "boo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "callingWrongAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_range",
-        "type": "uint256"
-      }
-    ],
-    "name": "createContract",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.bin
deleted file mode 100644
index 015d8065346f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610a58806100206000396000f3fe6080604052600436106100345760003560e01c806381871cbc1461003957806394ca2cb5146100765780639c4ae2d0146100b3575b600080fd5b34801561004557600080fd5b50610060600480360381019061005b9190610256565b6100cf565b60405161006d919061032f565b60405180910390f35b34801561008257600080fd5b5061009d60048036038101906100989190610486565b610145565b6040516100aa91906104f1565b60405180910390f35b6100cd60048036038101906100c89190610486565b61018f565b005b60606000604051806020016100e3906101a1565b6020820181038252601f19601f82011660405250905080848460405160200161010d92919061051b565b60405160208183030381529060405260405160200161012d929190610580565b60405160208183030381529060405291505092915050565b60008060ff60f81b3084868051906020012060405160200161016a9493929190610685565b6040516020818303038152906040528051906020012090508060001c91505092915050565b60008183516020850134f59050505050565b61034f806106d483390190565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101ed826101c2565b9050919050565b6101fd816101e2565b811461020857600080fd5b50565b60008135905061021a816101f4565b92915050565b6000819050919050565b61023381610220565b811461023e57600080fd5b50565b6000813590506102508161022a565b92915050565b6000806040838503121561026d5761026c6101b8565b5b600061027b8582860161020b565b925050602061028c85828601610241565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b60005b838110156102d05780820151818401526020810190506102b5565b838111156102df576000848401525b50505050565b6000601f19601f8301169050919050565b600061030182610296565b61030b81856102a1565b935061031b8185602086016102b2565b610324816102e5565b840191505092915050565b6000602082019050818103600083015261034981846102f6565b905092915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610393826102e5565b810181811067ffffffffffffffff821117156103b2576103b161035b565b5b80604052505050565b60006103c56101ae565b90506103d1828261038a565b919050565b600067ffffffffffffffff8211156103f1576103f061035b565b5b6103fa826102e5565b9050602081019050919050565b82818337600083830152505050565b6000610429610424846103d6565b6103bb565b90508281526020810184848401111561044557610444610356565b5b610450848285610407565b509392505050565b600082601f83011261046d5761046c610351565b5b813561047d848260208601610416565b91505092915050565b6000806040838503121561049d5761049c6101b8565b5b600083013567ffffffffffffffff8111156104bb576104ba6101bd565b5b6104c785828601610458565b92505060206104d885828601610241565b9150509250929050565b6104eb816101e2565b82525050565b600060208201905061050660008301846104e2565b92915050565b61051581610220565b82525050565b600060408201905061053060008301856104e2565b61053d602083018461050c565b9392505050565b600081905092915050565b600061055a82610296565b6105648185610544565b93506105748185602086016102b2565b80840191505092915050565b600061058c828561054f565b9150610598828461054f565b91508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b6105eb6105e6826105a4565b6105d0565b82525050565b60008160601b9050919050565b6000610609826105f1565b9050919050565b600061061b826105fe565b9050919050565b61063361062e826101e2565b610610565b82525050565b6000819050919050565b61065461064f82610220565b610639565b82525050565b6000819050919050565b6000819050919050565b61067f61067a8261065a565b610664565b82525050565b600061069182876105da565b6001820191506106a18286610622565b6014820191506106b18285610643565b6020820191506106c1828461066e565b6020820191508190509594505050505056fe608060405260405161034f38038061034f8339818101604052810190610025919061011a565b600a81111561003357600080fd5b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061015a565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100b182610086565b9050919050565b6100c1816100a6565b81146100cc57600080fd5b50565b6000815190506100de816100b8565b92915050565b6000819050919050565b6100f7816100e4565b811461010257600080fd5b50565b600081519050610114816100ee565b92915050565b6000806040838503121561013157610130610081565b5b600061013f858286016100cf565b925050602061015085828601610105565b9150509250929050565b6101e6806101696000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806312065fe014610051578063737bc3c91461006f5780638da5cb5b14610079578063c298557814610097575b600080fd5b6100596100b5565b6040516100669190610139565b60405180910390f35b6100776100bd565b005b6100816100f6565b60405161008e9190610195565b60405180910390f35b61009f61011a565b6040516100ac9190610139565b60405180910390f35b600047905090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b6000819050919050565b61013381610120565b82525050565b600060208201905061014e600083018461012a565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061017f82610154565b9050919050565b61018f81610174565b82525050565b60006020820190506101aa6000830184610186565b9291505056fea26469706673582212203046a6fada8dc090476b099fba9a803c100255e9ebe70a26dee4b60dd361494864736f6c634300080c0033a264697066735822122006d2b85e89c469aa8711608761e2b1e2762612a2d7d410de0e498137813e6ee764736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.json b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.json
deleted file mode 100644
index e0b5f920e0a2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.json
+++ /dev/null
@@ -1,68 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "deploy",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "bytecode",
-        "type": "bytes"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_salt",
-        "type": "uint256"
-      }
-    ],
-    "name": "getAddress",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_foo",
-        "type": "uint256"
-      }
-    ],
-    "name": "getBytecode",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.bin
deleted file mode 100644
index 212df3c0686d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610608806100136000396000f3fe6080604052600436106100295760003560e01c806369fc30b81461002e578063d104058d1461004a575b600080fd5b610048600480360381019061004391906102ed565b610066565b005b610064600480360381019061005f91906102ed565b6101a7565b005b60008263ffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc8563ffffffff169081150290604051600060405180830381858888f193505050501580156100bd573d6000803e3d6000fd5b503073ffffffffffffffffffffffffffffffffffffffff1663d104058d8585856040518463ffffffff1660e01b81526004016100fb9392919061034f565b600060405180830381600087803b15801561011557600080fd5b505af1925050508015610126575060015b6101a057610132610393565b806308c379a0141561018f5750610147610426565b806101525750610191565b7ffe46ad7cf507184ab42d7a2576647d779ff7bc7f831bfbead75fbe056c1adb63816040516101819190610544565b60405180910390a15061019b565b505b3d6000803e3d6000fd5b6101a1565b5b50505050565b60008263ffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc8563ffffffff169081150290604051600060405180830381858888f193505050501580156101fe573d6000803e3d6000fd5b5060008263ffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc8663ffffffff169081150290604051600060405180830381858888f19350505050158015610256573d6000803e3d6000fd5b50600160001461029b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610292906105b2565b60405180910390fd5b5050505050565b6000604051905090565b600080fd5b600063ffffffff82169050919050565b6102ca816102b1565b81146102d557600080fd5b50565b6000813590506102e7816102c1565b92915050565b600080600060608486031215610306576103056102ac565b5b6000610314868287016102d8565b9350506020610325868287016102d8565b9250506040610336868287016102d8565b9150509250925092565b610349816102b1565b82525050565b60006060820190506103646000830186610340565b6103716020830185610340565b61037e6040830184610340565b949350505050565b60008160e01c9050919050565b600060033d11156103b25760046000803e6103af600051610386565b90505b90565b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6103fe826103b5565b810181811067ffffffffffffffff8211171561041d5761041c6103c6565b5b80604052505050565b600060443d1015610436576104b9565b61043e6102a2565b60043d036004823e80513d602482011167ffffffffffffffff821117156104665750506104b9565b808201805167ffffffffffffffff81111561048457505050506104b9565b80602083010160043d0385018111156104a15750505050506104b9565b6104b0826020018501866103f5565b82955050505050505b90565b600081519050919050565b600082825260208201905092915050565b60005b838110156104f65780820151818401526020810190506104db565b83811115610505576000848401525b50505050565b6000610516826104bc565b61052081856104c7565b93506105308185602086016104d8565b610539816103b5565b840191505092915050565b6000602082019050818103600083015261055e818461050b565b905092915050565b7f4368616e676564206d79206d696e642100000000000000000000000000000000600082015250565b600061059c6010836104c7565b91506105a782610566565b602082019050919050565b600060208201905081810360008301526105cb8161058f565b905091905056fea2646970667358221220f16448d0228c4e69794d1a125957690344c5dc1bab65253473d1683cbef33dfe64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.json b/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.json
deleted file mode 100644
index 930d71295b96..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "reason",
-        "type": "string"
-      }
-    ],
-    "name": "ErrorLog",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numA",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numB",
-        "type": "uint32"
-      }
-    ],
-    "name": "revertAfterSending",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numA",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numB",
-        "type": "uint32"
-      }
-    ],
-    "name": "sendTo",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.bin
deleted file mode 100644
index 02ca0f2f9c3d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50612d01806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c806371033f8f1161007157806371033f8f1461014f57806375b4c78b1461016b5780639bb7939114610187578063b6326e43146101b7578063bc5350c6146101d3578063ec8c0afb146101ef576100a9565b8063146fa303146100ae57806325d7bf19146100df57806358124a8d146100fb5780636032261e1461011757806363734a7d14610133575b600080fd5b6100c860048036038101906100c39190611af3565b61020b565b6040516100d6929190612833565b60405180910390f35b6100f960048036038101906100f491906118d6565b61022a565b005b61011560048036038101906101109190611a74565b610238565b005b610131600480360381019061012c9190611975565b610248565b005b61014d600480360381019061014891906119c9565b610256565b005b610169600480360381019061016491906118d6565b610268565b005b61018560048036038101906101809190611912565b610276565b005b6101a1600480360381019061019c9190611b5a565b610288565b6040516101ae9190612818565b60405180910390f35b6101d160048036038101906101cc9190611bc1565b61029e565b005b6101ed60048036038101906101e89190611975565b6102aa565b005b61020960048036038101906102049190611912565b6102b8565b005b6000606061021a8585856102ca565b8092508193505050935093915050565b6102348282610336565b5050565b61024383838361038f565b505050565b61025282826103ea565b5050565b61026284848484610443565b50505050565b61027282826104a0565b5050565b610282848484846104f9565b50505050565b6000610295848484610556565b90509392505050565b6102a7816105ba565b50565b6102b48282610611565b5050565b6102c48484848461066a565b50505050565b6000606060006102db8686866106c7565b809450819550829350505050601660030b811461032d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610324906127f8565b60405180910390fd5b50935093915050565b6000610342838361083e565b9050601660030b811461038a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610381906127b8565b60405180910390fd5b505050565b600061039c848484610956565b9050601660030b81146103e4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103db90612758565b60405180910390fd5b50505050565b60006103f68383610a71565b9050601660030b811461043e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161043590612738565b60405180910390fd5b505050565b600061045185858585610b89565b9050601660030b8114610499576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610490906126d8565b60405180910390fd5b5050505050565b60006104ac8383610ca7565b9050601660030b81146104f4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104eb906127d8565b60405180910390fd5b505050565b600061050785858585610dbf565b9050601660030b811461054f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161054690612798565b60405180910390fd5b5050505050565b600080610564858585610edd565b8093508192505050601660030b81146105b2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105a990612778565b60405180910390fd5b509392505050565b60006105c582611006565b9050601660030b811461060d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161060490612718565b60405180910390fd5b5050565b600061061d838361111b565b9050601660030b8114610665576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161065c906126f8565b60405180910390fd5b505050565b600061067885858585611233565b9050601660030b81146106c0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106b7906126b8565b60405180910390fd5b5050505050565b60008060606000606061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016107069392919061261a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161077091906124c6565b6000604051808303816000865af19150503d80600081146107ad576040519150601f19603f3d011682016040523d82523d6000602084013e6107b2565b606091505b50915091508161080c57601560008067ffffffffffffffff811180156107d757600080fd5b506040519080825280602002602001820160405280156108065781602001602082028036833780820191505090505b50610821565b808060200190518101906108209190611c67565b5b8260030b9250809550819650829750505050505093509350939050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016108779291906124dd565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108e191906124c6565b6000604051808303816000865af19150503d806000811461091e576040519150601f19603f3d011682016040523d82523d6000602084013e610923565b606091505b509150915081610934576015610949565b808060200190518101906109489190611c02565b5b60030b9250505092915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b878787604051602401610991939291906125d5565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109fb91906124c6565b6000604051808303816000865af19150503d8060008114610a38576040519150601f19603f3d011682016040523d82523d6000602084013e610a3d565b606091505b509150915081610a4e576015610a63565b80806020019051810190610a629190611c02565b5b60030b925050509392505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16632e63879b60e01b8686604051602401610aaa92919061254b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b1491906124c6565b6000604051808303816000865af19150503d8060008114610b51576040519150601f19603f3d011682016040523d82523d6000602084013e610b56565b606091505b509150915081610b67576015610b7c565b80806020019051810190610b7b9190611c02565b5b60030b9250505092915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b88888888604051602401610bc6949392919061257b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610c3091906124c6565b6000604051808303816000865af19150503d8060008114610c6d576040519150601f19603f3d011682016040523d82523d6000602084013e610c72565b606091505b509150915081610c83576015610c98565b80806020019051810190610c979190611c02565b5b60030b92505050949350505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff1663099794e860e01b8686604051602401610ce09291906124dd565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610d4a91906124c6565b6000604051808303816000865af19150503d8060008114610d87576040519150601f19603f3d011682016040523d82523d6000602084013e610d8c565b606091505b509150915081610d9d576015610db2565b80806020019051810190610db19190611c02565b5b60030b9250505092915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b88888888604051602401610dfc9493929190612506565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610e6691906124c6565b6000604051808303816000865af19150503d8060008114610ea3576040519150601f19603f3d011682016040523d82523d6000602084013e610ea8565b606091505b509150915081610eb9576015610ece565b80806020019051810190610ecd9190611c02565b5b60030b92505050949350505050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b888888604051602401610f1a93929190612658565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f8491906124c6565b6000604051808303816000865af19150503d8060008114610fc1576040519150601f19603f3d011682016040523d82523d6000602084013e610fc6565b606091505b509150915081610fd95760156000610fee565b80806020019051810190610fed9190611c2b565b5b8160030b915080945081955050505050935093915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff1663189a554c60e01b8560405160240161103d9190612696565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110a791906124c6565b6000604051808303816000865af19150503d80600081146110e4576040519150601f19603f3d011682016040523d82523d6000602084013e6110e9565b606091505b5091509150816110fa57601561110f565b8080602001905181019061110e9190611c02565b5b60030b92505050919050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff166378b6391860e01b868660405160240161115492919061254b565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516111be91906124c6565b6000604051808303816000865af19150503d80600081146111fb576040519150601f19603f3d011682016040523d82523d6000602084013e611200565b606091505b509150915081611211576015611226565b808060200190518101906112259190611c02565b5b60030b9250505092915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b888888886040516024016112709493929190612506565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112da91906124c6565b6000604051808303816000865af19150503d8060008114611317576040519150601f19603f3d011682016040523d82523d6000602084013e61131c565b606091505b50915091508161132d576015611342565b808060200190518101906113419190611c02565b5b60030b92505050949350505050565b60008135905061136081612c58565b92915050565b600082601f83011261137757600080fd5b813561138a61138582612890565b612863565b915081818352602084019350602081019050838560208402820111156113af57600080fd5b60005b838110156113df57816113c58882611351565b8452602084019350602083019250506001810190506113b2565b5050505092915050565b600082601f8301126113fa57600080fd5b813561140d611408826128b8565b612863565b9150818183526020840193506020810190508360005b83811015611453578135860161143988826116dd565b845260208401935060208301925050600181019050611423565b5050505092915050565b600082601f83011261146e57600080fd5b815161148161147c826128e0565b612863565b915081818352602084019350602081019050838560208402820111156114a657600080fd5b60005b838110156114d657816114bc8882611731565b8452602084019350602083019250506001810190506114a9565b5050505092915050565b600082601f8301126114f157600080fd5b81356115046114ff82612908565b612863565b9150818183526020840193506020810190508385602084028201111561152957600080fd5b60005b83811015611559578161153f888261175b565b84526020840193506020830192505060018101905061152c565b5050505092915050565b600082601f83011261157457600080fd5b813561158761158282612930565b612863565b915081818352602084019350602081019050838560408402820111156115ac57600080fd5b60005b838110156115dc57816115c28882611770565b8452602084019350604083019250506001810190506115af565b5050505092915050565b600082601f8301126115f757600080fd5b813561160a61160582612958565b612863565b9150818183526020840193506020810190508385606084028201111561162f57600080fd5b60005b8381101561165f578161164588826117bc565b845260208401935060608301925050600181019050611632565b5050505092915050565b600082601f83011261167a57600080fd5b813561168d61168882612980565b612863565b9150818183526020840193506020810190508360005b838110156116d357813586016116b9888261181c565b8452602084019350602083019250506001810190506116a3565b5050505092915050565b600082601f8301126116ee57600080fd5b81356117016116fc826129a8565b612863565b9150808252602083016020830185838301111561171d57600080fd5b611728838284612c05565b50505092915050565b60008151905061174081612c6f565b92915050565b60008151905061175581612c86565b92915050565b60008135905061176a81612c9d565b92915050565b60006040828403121561178257600080fd5b61178c6040612863565b9050600061179c84828501611351565b60008301525060206117b08482850161175b565b60208301525092915050565b6000606082840312156117ce57600080fd5b6117d86060612863565b905060006117e884828501611351565b60008301525060206117fc84828501611351565b60208301525060406118108482850161175b565b60408301525092915050565b60006060828403121561182e57600080fd5b6118386060612863565b9050600061184884828501611351565b600083015250602082013567ffffffffffffffff81111561186857600080fd5b61187484828501611563565b602083015250604082013567ffffffffffffffff81111561189457600080fd5b6118a0848285016115e6565b60408301525092915050565b6000813590506118bb81612cb4565b92915050565b6000815190506118d081612cb4565b92915050565b600080604083850312156118e957600080fd5b60006118f785828601611351565b925050602061190885828601611351565b9150509250929050565b6000806000806080858703121561192857600080fd5b600061193687828801611351565b945050602061194787828801611351565b935050604061195887828801611351565b92505060606119698782880161175b565b91505092959194509250565b6000806040838503121561198857600080fd5b600061199685828601611351565b925050602083013567ffffffffffffffff8111156119b357600080fd5b6119bf85828601611366565b9150509250929050565b600080600080608085870312156119df57600080fd5b60006119ed87828801611351565b945050602085013567ffffffffffffffff811115611a0a57600080fd5b611a1687828801611366565b935050604085013567ffffffffffffffff811115611a3357600080fd5b611a3f87828801611366565b925050606085013567ffffffffffffffff811115611a5c57600080fd5b611a68878288016114e0565b91505092959194509250565b600080600060608486031215611a8957600080fd5b6000611a9786828701611351565b935050602084013567ffffffffffffffff811115611ab457600080fd5b611ac086828701611366565b925050604084013567ffffffffffffffff811115611add57600080fd5b611ae9868287016114e0565b9150509250925092565b600080600060608486031215611b0857600080fd5b6000611b1686828701611351565b9350506020611b27868287016118ac565b925050604084013567ffffffffffffffff811115611b4457600080fd5b611b50868287016113e9565b9150509250925092565b600080600060608486031215611b6f57600080fd5b6000611b7d86828701611351565b9350506020611b8e868287016118ac565b925050604084013567ffffffffffffffff811115611bab57600080fd5b611bb7868287016114e0565b9150509250925092565b600060208284031215611bd357600080fd5b600082013567ffffffffffffffff811115611bed57600080fd5b611bf984828501611669565b91505092915050565b600060208284031215611c1457600080fd5b6000611c2284828501611746565b91505092915050565b60008060408385031215611c3e57600080fd5b6000611c4c85828601611746565b9250506020611c5d858286016118c1565b9150509250929050565b600080600060608486031215611c7c57600080fd5b6000611c8a86828701611746565b9350506020611c9b868287016118c1565b925050604084015167ffffffffffffffff811115611cb857600080fd5b611cc48682870161145d565b9150509250925092565b6000611cda8383611d6e565b60208301905092915050565b6000611cf2838361204c565b905092915050565b6000611d0683836120b6565b60208301905092915050565b6000611d1e83836120c5565b60208301905092915050565b6000611d3683836123ef565b60408301905092915050565b6000611d4e838361241e565b60608301905092915050565b6000611d668383612460565b905092915050565b611d7781612b9b565b82525050565b611d8681612b9b565b82525050565b6000611d9782612a44565b611da18185612af7565b9350611dac836129d4565b8060005b83811015611ddd578151611dc48882611cce565b9750611dcf83612a9c565b925050600181019050611db0565b5085935050505092915050565b6000611df582612a4f565b611dff8185612b08565b935083602082028501611e11856129e4565b8060005b85811015611e4d5784840389528151611e2e8582611ce6565b9450611e3983612aa9565b925060208a01995050600181019050611e15565b50829750879550505050505092915050565b6000611e6a82612a5a565b611e748185612b19565b9350611e7f836129f4565b8060005b83811015611eb0578151611e978882611cfa565b9750611ea283612ab6565b925050600181019050611e83565b5085935050505092915050565b6000611ec882612a65565b611ed28185612b2a565b9350611edd83612a04565b8060005b83811015611f0e578151611ef58882611d12565b9750611f0083612ac3565b925050600181019050611ee1565b5085935050505092915050565b6000611f2682612a70565b611f308185612b3b565b9350611f3b83612a14565b8060005b83811015611f6c578151611f538882611d2a565b9750611f5e83612ad0565b925050600181019050611f3f565b5085935050505092915050565b6000611f8482612a7b565b611f8e8185612b4c565b9350611f9983612a24565b8060005b83811015611fca578151611fb18882611d42565b9750611fbc83612add565b925050600181019050611f9d565b5085935050505092915050565b6000611fe282612a86565b611fec8185612b5d565b935083602082028501611ffe85612a34565b8060005b8581101561203a578484038952815161201b8582611d5a565b945061202683612aea565b925060208a01995050600181019050612002565b50829750879550505050505092915050565b600061205782612a91565b6120618185612b6e565b9350612071818560208601612c14565b61207a81612c47565b840191505092915050565b600061209082612a91565b61209a8185612b7f565b93506120aa818560208601612c14565b80840191505092915050565b6120bf81612bad565b82525050565b6120ce81612bc4565b82525050565b6120dd81612bc4565b82525050565b60006120f0601b83612b8a565b91507f5361666520746f6b656e207472616e73666572206661696c65642100000000006000830152602082019050919050565b6000612130601a83612b8a565b91507f53616665204e465473207472616e73666572206661696c6564210000000000006000830152602082019050919050565b6000612170602383612b8a565b91507f53616665206d756c7469706c6520646973736f63696174696f6e73206661696c60008301527f65642100000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b60006121d6601c83612b8a565b91507f536166652063727970746f207472616e73666572206661696c656421000000006000830152602082019050919050565b6000612216602283612b8a565b91507f53616665206d756c7469706c65206173736f63696174696f6e73206661696c6560008301527f64210000000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b600061227c601c83612b8a565b91507f5361666520746f6b656e73207472616e73666572206661696c656421000000006000830152602082019050919050565b60006122bc601183612b8a565b91507f53616665206275726e206661696c6564210000000000000000000000000000006000830152602082019050919050565b60006122fc601983612b8a565b91507f53616665204e4654207472616e73666572206661696c656421000000000000006000830152602082019050919050565b600061233c601f83612b8a565b91507f536166652073696e676c65206173736f63696174696f6e206661696c656421006000830152602082019050919050565b600061237c602083612b8a565b91507f536166652073696e676c6520646973736f63696174696f6e206661696c6564216000830152602082019050919050565b60006123bc601183612b8a565b91507f53616665206d696e74206661696c6564210000000000000000000000000000006000830152602082019050919050565b6040820160008201516124056000850182611d6e565b50602082015161241860208501826120c5565b50505050565b6060820160008201516124346000850182611d6e565b5060208201516124476020850182611d6e565b50604082015161245a60408501826120c5565b50505050565b60006060830160008301516124786000860182611d6e565b50602083015184820360208601526124908282611f1b565b915050604083015184820360408601526124aa8282611f79565b9150508091505092915050565b6124c081612bf1565b82525050565b60006124d28284612085565b915081905092915050565b60006040820190506124f26000830185611d7d565b6124ff6020830184611d7d565b9392505050565b600060808201905061251b6000830187611d7d565b6125286020830186611d7d565b6125356040830185611d7d565b61254260608301846120d4565b95945050505050565b60006040820190506125606000830185611d7d565b81810360208301526125728184611d8c565b90509392505050565b60006080820190506125906000830187611d7d565b81810360208301526125a28186611d8c565b905081810360408301526125b68185611d8c565b905081810360608301526125ca8184611ebd565b905095945050505050565b60006060820190506125ea6000830186611d7d565b81810360208301526125fc8185611d8c565b905081810360408301526126108184611ebd565b9050949350505050565b600060608201905061262f6000830186611d7d565b61263c60208301856124b7565b818103604083015261264e8184611dea565b9050949350505050565b600060608201905061266d6000830186611d7d565b61267a60208301856124b7565b818103604083015261268c8184611ebd565b9050949350505050565b600060208201905081810360008301526126b08184611fd7565b905092915050565b600060208201905081810360008301526126d1816120e3565b9050919050565b600060208201905081810360008301526126f181612123565b9050919050565b6000602082019050818103600083015261271181612163565b9050919050565b60006020820190508181036000830152612731816121c9565b9050919050565b6000602082019050818103600083015261275181612209565b9050919050565b600060208201905081810360008301526127718161226f565b9050919050565b60006020820190508181036000830152612791816122af565b9050919050565b600060208201905081810360008301526127b1816122ef565b9050919050565b600060208201905081810360008301526127d18161232f565b9050919050565b600060208201905081810360008301526127f18161236f565b9050919050565b60006020820190508181036000830152612811816123af565b9050919050565b600060208201905061282d60008301846124b7565b92915050565b600060408201905061284860008301856124b7565b818103602083015261285a8184611e5f565b90509392505050565b6000604051905081810181811067ffffffffffffffff8211171561288657600080fd5b8060405250919050565b600067ffffffffffffffff8211156128a757600080fd5b602082029050602081019050919050565b600067ffffffffffffffff8211156128cf57600080fd5b602082029050602081019050919050565b600067ffffffffffffffff8211156128f757600080fd5b602082029050602081019050919050565b600067ffffffffffffffff82111561291f57600080fd5b602082029050602081019050919050565b600067ffffffffffffffff82111561294757600080fd5b602082029050602081019050919050565b600067ffffffffffffffff82111561296f57600080fd5b602082029050602081019050919050565b600067ffffffffffffffff82111561299757600080fd5b602082029050602081019050919050565b600067ffffffffffffffff8211156129bf57600080fd5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000612ba682612bd1565b9050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b82818337600083830152505050565b60005b83811015612c32578082015181840152602081019050612c17565b83811115612c41576000848401525b50505050565b6000601f19601f8301169050919050565b612c6181612b9b565b8114612c6c57600080fd5b50565b612c7881612bad565b8114612c8357600080fd5b50565b612c8f81612bb7565b8114612c9a57600080fd5b50565b612ca681612bc4565b8114612cb157600080fd5b50565b612cbd81612bf1565b8114612cc857600080fd5b5056fea2646970667358221220e7172f23f8d782409b25948b3b56ddd7db7727d1ad16e49d982e63a5b2e7c5c864736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.json
deleted file mode 100644
index 43402789335c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.json
+++ /dev/null
@@ -1,303 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "safeNFTTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "sender",
-        "type": "address[]"
-      },
-      {
-        "internalType": "address[]",
-        "name": "receiver",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumber",
-        "type": "int64[]"
-      }
-    ],
-    "name": "safeNFTsTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "safeTokenAssociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "safeTokenBurn",
-    "outputs": [
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "safeTokenDissociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "safeTokenMint",
-    "outputs": [
-      {
-        "internalType": "uint64",
-        "name": "newTotalSupply",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int256[]",
-        "name": "serialNumbers",
-        "type": "int256[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "safeTokenTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "safeTokensAssociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "safeTokensDissociate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "accountIds",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "amounts",
-        "type": "int64[]"
-      }
-    ],
-    "name": "safeTokensTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransfers",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "safeTransferCrypto",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.bin
deleted file mode 100644
index 07b8268cddaa..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526040516107643803806107648339818101604052810190610025919061006d565b806000819055505061009a565b600080fd5b6000819050919050565b61004a81610037565b811461005557600080fd5b50565b60008151905061006781610041565b92915050565b60006020828403121561008357610082610032565b5b600061009184828501610058565b91505092915050565b6106bb806100a96000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063021bf72c1461005157806302ed18dd1461006f5780630ca7e6861461008d57806345201896146100a9575b600080fd5b6100596100c5565b6040516100669190610257565b60405180910390f35b6100776100cb565b6040516100849190610257565b60405180910390f35b6100a760048036038101906100a291906102ad565b6100d4565b005b6100c360048036038101906100be91906102ad565b61014e565b005b60005481565b60008054905090565b80306000546040516100e590610231565b6100f092919061031b565b8190604051809103906000f5905080158015610110573d6000803e3d6000fd5b50507f7ff51c37f7a5d721e388c564567e90ae40bfaa77adce61f755d530a6dfff63c16000546040516101439190610257565b60405180910390a150565b6000813060005460405161016190610231565b61016c92919061031b565b8190604051809103906000f590508015801561018c573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663737bc3c96040518163ffffffff1660e01b8152600401600060405180830381600087803b1580156101d757600080fd5b505af11580156101eb573d6000803e3d6000fd5b50505050813060005460405161020090610231565b61020b92919061031b565b8190604051809103906000f590508015801561022b573d6000803e3d6000fd5b50505050565b6103418061034583390190565b6000819050919050565b6102518161023e565b82525050565b600060208201905061026c6000830184610248565b92915050565b600080fd5b6000819050919050565b61028a81610277565b811461029557600080fd5b50565b6000813590506102a781610281565b92915050565b6000602082840312156102c3576102c2610272565b5b60006102d184828501610298565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610305826102da565b9050919050565b610315816102fa565b82525050565b6000604082019050610330600083018561030c565b61033d6020830184610248565b939250505056fe60806040526040516103413803806103418339818101604052810190610025919061010c565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061014c565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a382610078565b9050919050565b6100b381610098565b81146100be57600080fd5b50565b6000815190506100d0816100aa565b92915050565b6000819050919050565b6100e9816100d6565b81146100f457600080fd5b50565b600081519050610106816100e0565b92915050565b6000806040838503121561012357610122610073565b5b6000610131858286016100c1565b9250506020610142858286016100f7565b9150509250929050565b6101e68061015b6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806312065fe014610051578063737bc3c91461006f5780638da5cb5b14610079578063c298557814610097575b600080fd5b6100596100b5565b6040516100669190610139565b60405180910390f35b6100776100bd565b005b6100816100f6565b60405161008e9190610195565b60405180910390f35b61009f61011a565b6040516100ac9190610139565b60405180910390f35b600047905090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b6000819050919050565b61013381610120565b82525050565b600060208201905061014e600083018461012a565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061017f82610154565b9050919050565b61018f81610174565b82525050565b60006020820190506101aa6000830184610186565b9291505056fea26469706673582212206cfbeb1b2b67f2f4fdad8036aa550b362a6a4629d0cff68c1bf509198f17069264736f6c634300080c0033a26469706673582212200bcadd20f23702e445ad6874942748a91de42d33ab674f9dafdece3e20f88c3a64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.json
deleted file mode 100644
index 3cd439ea2023..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.json
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_primal_foo",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "v",
-        "type": "uint256"
-      }
-    ],
-    "name": "Creation",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "createAndRecreateTest",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "createSaltedTestContract",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "primal_foo",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "whatTheFoo",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.bin
deleted file mode 100644
index 1d90aa4fe225..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610cbe806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80636415e9521461003b5780637a69ff5714610057575b600080fd5b61005560048036038101906100509190610234565b610073565b005b610071600480360381019061006c91906102bf565b610177565b005b6000602a9050600060ff60f81b308460405180602001610092906101ec565b6020820181038252601f19601f82011660405250856040516020016100b89291906103a4565b604051602081830303815290604052805190602001206040516020016100e19493929190610482565b6040516020818303038152906040528051906020012060001c90506000838360405161010c906101ec565b61011691906104df565b8190604051809103906000f5905080158015610136573d6000803e3d6000fd5b5090508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161461017157600080fd5b50505050565b60008290508073ffffffffffffffffffffffffffffffffffffffff16630ca7e686836040518263ffffffff1660e01b81526004016101b59190610509565b600060405180830381600087803b1580156101cf57600080fd5b505af11580156101e3573d6000803e3d6000fd5b50505050505050565b6107648061052583390190565b600080fd5b6000819050919050565b610211816101fe565b811461021c57600080fd5b50565b60008135905061022e81610208565b92915050565b60006020828403121561024a576102496101f9565b5b60006102588482850161021f565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061028c82610261565b9050919050565b61029c81610281565b81146102a757600080fd5b50565b6000813590506102b981610293565b92915050565b600080604083850312156102d6576102d56101f9565b5b60006102e4858286016102aa565b92505060206102f58582860161021f565b9150509250929050565b600081519050919050565b600081905092915050565b60005b83811015610333578082015181840152602081019050610318565b83811115610342576000848401525b50505050565b6000610353826102ff565b61035d818561030a565b935061036d818560208601610315565b80840191505092915050565b6000819050919050565b6000819050919050565b61039e61039982610379565b610383565b82525050565b60006103b08285610348565b91506103bc828461038d565b6020820191508190509392505050565b60007fff0000000000000000000000000000000000000000000000000000000000000082169050919050565b6000819050919050565b61041361040e826103cc565b6103f8565b82525050565b60008160601b9050919050565b600061043182610419565b9050919050565b600061044382610426565b9050919050565b61045b61045682610281565b610438565b82525050565b6000819050919050565b61047c610477826101fe565b610461565b82525050565b600061048e8287610402565b60018201915061049e828661044a565b6014820191506104ae828561046b565b6020820191506104be828461046b565b60208201915081905095945050505050565b6104d981610379565b82525050565b60006020820190506104f460008301846104d0565b92915050565b610503816101fe565b82525050565b600060208201905061051e60008301846104fa565b9291505056fe60806040526040516107643803806107648339818101604052810190610025919061006d565b806000819055505061009a565b600080fd5b6000819050919050565b61004a81610037565b811461005557600080fd5b50565b60008151905061006781610041565b92915050565b60006020828403121561008357610082610032565b5b600061009184828501610058565b91505092915050565b6106bb806100a96000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063021bf72c1461005157806302ed18dd1461006f5780630ca7e6861461008d57806345201896146100a9575b600080fd5b6100596100c5565b6040516100669190610257565b60405180910390f35b6100776100cb565b6040516100849190610257565b60405180910390f35b6100a760048036038101906100a291906102ad565b6100d4565b005b6100c360048036038101906100be91906102ad565b61014e565b005b60005481565b60008054905090565b80306000546040516100e590610231565b6100f092919061031b565b8190604051809103906000f5905080158015610110573d6000803e3d6000fd5b50507f7ff51c37f7a5d721e388c564567e90ae40bfaa77adce61f755d530a6dfff63c16000546040516101439190610257565b60405180910390a150565b6000813060005460405161016190610231565b61016c92919061031b565b8190604051809103906000f590508015801561018c573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663737bc3c96040518163ffffffff1660e01b8152600401600060405180830381600087803b1580156101d757600080fd5b505af11580156101eb573d6000803e3d6000fd5b50505050813060005460405161020090610231565b61020b92919061031b565b8190604051809103906000f590508015801561022b573d6000803e3d6000fd5b50505050565b6103418061034583390190565b6000819050919050565b6102518161023e565b82525050565b600060208201905061026c6000830184610248565b92915050565b600080fd5b6000819050919050565b61028a81610277565b811461029557600080fd5b50565b6000813590506102a781610281565b92915050565b6000602082840312156102c3576102c2610272565b5b60006102d184828501610298565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610305826102da565b9050919050565b610315816102fa565b82525050565b6000604082019050610330600083018561030c565b61033d6020830184610248565b939250505056fe60806040526040516103413803806103418339818101604052810190610025919061010c565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061014c565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a382610078565b9050919050565b6100b381610098565b81146100be57600080fd5b50565b6000815190506100d0816100aa565b92915050565b6000819050919050565b6100e9816100d6565b81146100f457600080fd5b50565b600081519050610106816100e0565b92915050565b6000806040838503121561012357610122610073565b5b6000610131858286016100c1565b9250506020610142858286016100f7565b9150509250929050565b6101e68061015b6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806312065fe014610051578063737bc3c91461006f5780638da5cb5b14610079578063c298557814610097575b600080fd5b6100596100b5565b6040516100669190610139565b60405180910390f35b6100776100bd565b005b6100816100f6565b60405161008e9190610195565b60405180910390f35b61009f61011a565b6040516100ac9190610139565b60405180910390f35b600047905090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b6000819050919050565b61013381610120565b82525050565b600060208201905061014e600083018461012a565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061017f82610154565b9050919050565b61018f81610174565b82525050565b60006020820190506101aa6000830184610186565b9291505056fea26469706673582212206885e9ea776420fd61b9574a72e5f05dae9491a993c61d080ffdfa779aaaa14d64736f6c634300080c0033a26469706673582212200ecc8f9d78d1117dc8b02db4c3e4b16fe987bd0ff40c6c7f720ea9dceef7588c64736f6c634300080c0033a264697066735822122075f1416cd4cf879fc9a1690982b85e5d62458619f1df7e2ca26cb11e7f73eb1464736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.json
deleted file mode 100644
index e75c6f041316..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "buildCreator",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "creator_address",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "salt",
-        "type": "bytes32"
-      }
-    ],
-    "name": "callCreator",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.bin
deleted file mode 100644
index e60d91e1da1b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516106bd3803806106bd833981810160405281019061003291906101df565b6000309050600061004d828461009d60201b6100091760201c565b9050601660030b8114610095576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161008c906102dc565b60405180910390fd5b5050506103f1565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016100d69291906102b3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610140919061029c565b6000604051808303816000865af19150503d806000811461017d576040519150601f19603f3d011682016040523d82523d6000602084013e610182565b606091505b5091509150816101935760156101a8565b808060200190518101906101a7919061020c565b5b60030b9250505092915050565b6000815190506101c4816103c3565b92915050565b6000815190506101d9816103da565b92915050565b6000602082840312156101f5576101f4610395565b5b6000610203848285016101b5565b91505092915050565b60006020828403121561022257610221610395565b5b6000610230848285016101ca565b91505092915050565b61024281610323565b82525050565b6000610253826102fc565b61025d8185610307565b935061026d818560208601610362565b80840191505092915050565b6000610286601b83610312565b91506102918261039a565b602082019050919050565b60006102a88284610248565b915081905092915050565b60006040820190506102c86000830185610239565b6102d56020830184610239565b9392505050565b600060208201905081810360008301526102f581610279565b9050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b600061032e82610342565b9050919050565b60008160030b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b83811015610380578082015181840152602081019050610365565b8381111561038f576000848401525b50505050565b600080fd5b7f436f756c64206e6f74206173736f6369617465206163636f756e740000000000600082015250565b6103cc81610323565b81146103d757600080fd5b50565b6103e381610335565b81146103ee57600080fd5b50565b6102bd806104006000396000f3fe6080604052600080fd5b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016100429291906101ba565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516100ac91906101a3565b6000604051808303816000865af19150503d80600081146100e9576040519150601f19603f3d011682016040523d82523d6000602084013e6100ee565b606091505b5091509150816100ff576015610114565b808060200190518101906101139190610136565b5b60030b9250505092915050565b60008151905061013081610270565b92915050565b60006020828403121561014c5761014b61026b565b5b600061015a84828501610121565b91505092915050565b61016c816101f9565b82525050565b600061017d826101e3565b61018781856101ee565b9350610197818560208601610238565b80840191505092915050565b60006101af8284610172565b915081905092915050565b60006040820190506101cf6000830185610163565b6101dc6020830184610163565b9392505050565b600081519050919050565b600081905092915050565b600061020482610218565b9050919050565b60008160030b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b8381101561025657808201518184015260208101905061023b565b83811115610265576000848401525b50505050565b600080fd5b6102798161020b565b811461028457600080fd5b5056fea2646970667358221220b707c998af4d022892a5dc4ee1bc42234b9d20a36a7e4d783deaa7eda36ed17564736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.json
deleted file mode 100644
index 3565af7a80f2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddr",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.bin
deleted file mode 100644
index 6b17e7122d06..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260ad806100126000396000f3fe60806040526004361060265760003560e01c806383197ef014602b578063c34560f5146032575b600080fd5b603033ff5b005b6030603d3660046049565b806001600160a01b0316ff5b600060208284031215605a57600080fd5b81356001600160a01b0381168114607057600080fd5b939250505056fea2646970667358221220cea8cc97ec0b1b7c501e13b691b8ae6e5d3d10449f3d7b61ba749967d27e44b364736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.json
deleted file mode 100644
index 36e68a5925cb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "destroy",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "destroyExplicitBeneficiary",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.bin
deleted file mode 100644
index 6f1b8c133ac3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052610352806100136000396000f3fe6080604052600436106100225760003560e01c806399bb15441461002b57610029565b3661002957005b005b61004560048036038101906100409190610200565b610047565b005b60008267ffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166108fc8367ffffffffffffffff169081150290604051600060405180830381858888f193505050501580156100a6573d6000803e3d6000fd5b5060008467ffffffffffffffff1690506000808273ffffffffffffffffffffffffffffffffffffffff1686866040516024016100e3929190610262565b6040516020818303038152906040527f5f232eb9000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161016d9190610305565b600060405180830381855af49150503d80600081146101a8576040519150601f19603f3d011682016040523d82523d6000602084013e6101ad565b606091505b509150915050505050505050565b600080fd5b600067ffffffffffffffff82169050919050565b6101dd816101c0565b81146101e857600080fd5b50565b6000813590506101fa816101d4565b92915050565b600080600060608486031215610219576102186101bb565b5b6000610227868287016101eb565b9350506020610238868287016101eb565b9250506040610249868287016101eb565b9150509250925092565b61025c816101c0565b82525050565b60006040820190506102776000830185610253565b6102846020830184610253565b9392505050565b600081519050919050565b600081905092915050565b60005b838110156102bf5780820151818401526020810190506102a4565b838111156102ce576000848401525b50505050565b60006102df8261028b565b6102e98185610296565b93506102f98185602086016102a1565b80840191505092915050565b600061031182846102d4565b91508190509291505056fea2646970667358221220c2c7bd0488cff0a0076ed910cea4d609a7f3560dc2296288d1a9255289084dde64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.json
deleted file mode 100644
index d8aeae30fc4d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.json
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint64",
-        "name": "just_send_num",
-        "type": "uint64"
-      },
-      {
-        "internalType": "uint64",
-        "name": "account_num",
-        "type": "uint64"
-      },
-      {
-        "internalType": "uint64",
-        "name": "value",
-        "type": "uint64"
-      }
-    ],
-    "name": "sendRepeatedlyTo",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "receive"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.bin
deleted file mode 100644
index ecadd35d9f71..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506110b3806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80631a1eb403146100515780637c41ad2c1461006d578063a4aa39b11461009d578063c7b2d336146100b9575b600080fd5b61006b6004803603810190610066919061095f565b6100d5565b005b61008760048036038101906100829190610897565b610134565b6040516100949190610df9565b60405180910390f35b6100b760048036038101906100b291906108c0565b610249565b005b6100d360048036038101906100ce9190610923565b6102a6565b005b6000806100e3858585610355565b91509150601660030b821461012d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161012490610e34565b60405180910390fd5b5050505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161016b9190610d1d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101d59190610d06565b6000604051808303816000865af19150503d8060008114610212576040519150601f19603f3d011682016040523d82523d6000602084013e610217565b606091505b50915091508161022857601561023d565b8080602001905181019061023c91906109c6565b5b60030b92505050919050565b60006102578585858561047e565b9050601660030b811461029f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161029690610e14565b60405180910390fd5b5050505050565b60008060606103028585600067ffffffffffffffff811180156102c857600080fd5b506040519080825280602002602001820160405280156102fc57816020015b60608152602001906001900390816102e75790505b5061059c565b925092509250601660030b831461034e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161034590610e54565b60405180910390fd5b5050505050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b88888860405160240161039293929190610dbb565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103fc9190610d06565b6000604051808303816000865af19150503d8060008114610439576040519150601f19603f3d011682016040523d82523d6000602084013e61043e565b606091505b5091509150816104515760156000610466565b8080602001905181019061046591906109ef565b5b8160030b915080945081955050505050935093915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016104bb9493929190610d38565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105259190610d06565b6000604051808303816000865af19150503d8060008114610562576040519150601f19603f3d011682016040523d82523d6000602084013e610567565b606091505b50915091508161057857601561058d565b8080602001905181019061058c91906109c6565b5b60030b92505050949350505050565b60008060606000606061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b8989896040516024016105db93929190610d7d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106459190610d06565b6000604051808303816000865af19150503d8060008114610682576040519150601f19603f3d011682016040523d82523d6000602084013e610687565b606091505b5091509150816106e157601560008067ffffffffffffffff811180156106ac57600080fd5b506040519080825280602002602001820160405280156106db5781602001602082028036833780820191505090505b506106f6565b808060200190518101906106f59190610a2b565b5b8260030b9250809550819650829750505050505093509350939050565b60008135905061072281611021565b92915050565b600082601f83011261073957600080fd5b813561074c61074782610ea1565b610e74565b9150818183526020840193506020810190508385602084028201111561077157600080fd5b60005b838110156107a157816107878882610843565b845260208401935060208301925050600181019050610774565b5050505092915050565b600082601f8301126107bc57600080fd5b81516107cf6107ca82610ea1565b610e74565b915081818352602084019350602081019050838560208402820111156107f457600080fd5b60005b83811015610824578161080a8882610858565b8452602084019350602083019250506001810190506107f7565b5050505092915050565b60008151905061083d81611038565b92915050565b6000813590506108528161104f565b92915050565b6000815190506108678161104f565b92915050565b60008135905061087c81611066565b92915050565b60008151905061089181611066565b92915050565b6000602082840312156108a957600080fd5b60006108b784828501610713565b91505092915050565b600080600080608085870312156108d657600080fd5b60006108e487828801610713565b94505060206108f587828801610713565b935050604061090687828801610713565b925050606061091787828801610843565b91505092959194509250565b6000806040838503121561093657600080fd5b600061094485828601610713565b92505060206109558582860161086d565b9150509250929050565b60008060006060848603121561097457600080fd5b600061098286828701610713565b93505060206109938682870161086d565b925050604084013567ffffffffffffffff8111156109b057600080fd5b6109bc86828701610728565b9150509250925092565b6000602082840312156109d857600080fd5b60006109e68482850161082e565b91505092915050565b60008060408385031215610a0257600080fd5b6000610a108582860161082e565b9250506020610a2185828601610882565b9150509250929050565b600080600060608486031215610a4057600080fd5b6000610a4e8682870161082e565b9350506020610a5f86828701610882565b925050604084015167ffffffffffffffff811115610a7c57600080fd5b610a88868287016107ab565b9150509250925092565b6000610a9e8383610ba0565b905092915050565b6000610ab28383610c19565b60208301905092915050565b610ac781610f73565b82525050565b6000610ad882610ee9565b610ae28185610f24565b935083602082028501610af485610ec9565b8060005b85811015610b305784840389528151610b118582610a92565b9450610b1c83610f0a565b925060208a01995050600181019050610af8565b50829750879550505050505092915050565b6000610b4d82610ef4565b610b578185610f35565b9350610b6283610ed9565b8060005b83811015610b93578151610b7a8882610aa6565b9750610b8583610f17565b925050600181019050610b66565b5085935050505092915050565b6000610bab82610eff565b610bb58185610f46565b9350610bc5818560208601610fdd565b610bce81611010565b840191505092915050565b6000610be482610eff565b610bee8185610f57565b9350610bfe818560208601610fdd565b80840191505092915050565b610c1381610f85565b82525050565b610c2281610f9c565b82525050565b610c3181610f9c565b82525050565b6000610c44601583610f62565b91507f546f6b656e207472616e73666572206661696c656400000000000000000000006000830152602082019050919050565b6000610c84601183610f62565b91507f546f6b656e206275726e206661696c65640000000000000000000000000000006000830152602082019050919050565b6000610cc4601e83610f62565b91507f4d696e74206f662066756e6769626c6520746f6b656e206661696c65642100006000830152602082019050919050565b610d0081610fc9565b82525050565b6000610d128284610bd9565b915081905092915050565b6000602082019050610d326000830184610abe565b92915050565b6000608082019050610d4d6000830187610abe565b610d5a6020830186610abe565b610d676040830185610abe565b610d746060830184610c28565b95945050505050565b6000606082019050610d926000830186610abe565b610d9f6020830185610cf7565b8181036040830152610db18184610acd565b9050949350505050565b6000606082019050610dd06000830186610abe565b610ddd6020830185610cf7565b8181036040830152610def8184610b42565b9050949350505050565b6000602082019050610e0e6000830184610c0a565b92915050565b60006020820190508181036000830152610e2d81610c37565b9050919050565b60006020820190508181036000830152610e4d81610c77565b9050919050565b60006020820190508181036000830152610e6d81610cb7565b9050919050565b6000604051905081810181811067ffffffffffffffff82111715610e9757600080fd5b8060405250919050565b600067ffffffffffffffff821115610eb857600080fd5b602082029050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000610f7e82610fa9565b9050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b60005b83811015610ffb578082015181840152602081019050610fe0565b8381111561100a576000848401525b50505050565b6000601f19601f8301169050919050565b61102a81610f73565b811461103557600080fd5b50565b61104181610f8f565b811461104c57600080fd5b50565b61105881610f9c565b811461106357600080fd5b50565b61106f81610fc9565b811461107a57600080fd5b5056fea2646970667358221220ef11a107cb684a346d4a56b8dd37c6325b919d9890f7b470abd5404f9b3c4a4164736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.json
deleted file mode 100644
index 62aa9843d7f8..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "nftTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "tokenBurn",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      }
-    ],
-    "name": "tokenMint",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.bin
deleted file mode 100644
index dfca8a9e66b0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052600f60005534801561001557600080fd5b5060c6806100246000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c806360fe47b11460375780636d4ce63c146062575b600080fd5b606060048036036020811015604b57600080fd5b8101908080359060200190929190505050607e565b005b60686088565b6040518082815260200191505060405180910390f35b8060008190555050565b6000805490509056fea265627a7a72315820282338bfefd3f999df1c0720c85b7c793351e5975bb495992f1216926eea891564736f6c634300050b0032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.json
deleted file mode 100644
index ce1819bfc4af..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "x",
-        "type": "uint256"
-      }
-    ],
-    "name": "set",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "get",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "_get",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.bin
deleted file mode 100644
index 941afea80add..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610262806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80631ab06ee514610051578063b9caebf41461006d578063c30365d214610089578063eded97fa146100a7575b600080fd5b61006b60048036038101906100669190610137565b6100c5565b005b610087600480360381019061008291906101d5565b6100d7565b005b6100916100f0565b60405161009e9190610211565b60405180910390f35b6100af6100f6565b6040516100bc9190610211565b60405180910390f35b81600081905550806001819055505050565b8073ffffffffffffffffffffffffffffffffffffffff16ff5b60015481565b60005481565b600080fd5b6000819050919050565b61011481610101565b811461011f57600080fd5b50565b6000813590506101318161010b565b92915050565b6000806040838503121561014e5761014d6100fc565b5b600061015c85828601610122565b925050602061016d85828601610122565b9150509250929050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101a282610177565b9050919050565b6101b281610197565b81146101bd57600080fd5b50565b6000813590506101cf816101a9565b92915050565b6000602082840312156101eb576101ea6100fc565b5b60006101f9848285016101c0565b91505092915050565b61020b81610101565b82525050565b60006020820190506102266000830184610202565b9291505056fea2646970667358221220462f6348be7dc5d4cb2fdd2140af9477633f422e085fbf1e53d189d0e3ad581964736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.json
deleted file mode 100644
index e594529df7bb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "del",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "pos0",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "pos1",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "m",
-        "type": "uint256"
-      }
-    ],
-    "name": "set",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.bin
deleted file mode 100755
index 617f232f169d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060405161001d9061007f565b604051809103906000f080158015610039573d6000803e3d6000fd5b50600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061008c565b6101538061042883390190565b61038d8061009b6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806319e8dce21461005c57806322b9411f1461007a5780634e47a3fe14610096578063a5872699146100b4578063c7821568146100d0575b600080fd5b6100646100ee565b604051610071919061025c565b60405180910390f35b610094600480360381019061008f91906102a8565b6100f4565b005b61009e6100fe565b6040516100ab919061025c565b60405180910390f35b6100ce60048036038101906100c991906102d5565b6101a5565b005b6100d861023d565b6040516100e5919061025c565b60405180910390f35b60015481565b8060018190555050565b6000600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16634e47a3fe6040518163ffffffff1660e01b815260040160206040518083038186803b15801561016857600080fd5b505afa15801561017c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a0919061032a565b905090565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166393a98a3b826040518263ffffffff1660e01b8152600401610200919061025c565b600060405180830381600087803b15801561021a57600080fd5b505af115801561022e573d6000803e3d6000fd5b50505050816000819055505050565b60005481565b6000819050919050565b61025681610243565b82525050565b6000602082019050610271600083018461024d565b92915050565b600080fd5b61028581610243565b811461029057600080fd5b50565b6000813590506102a28161027c565b92915050565b6000602082840312156102be576102bd610277565b5b60006102cc84828501610293565b91505092915050565b600080604083850312156102ec576102eb610277565b5b60006102fa85828601610293565b925050602061030b85828601610293565b9150509250929050565b6000815190506103248161027c565b92915050565b6000602082840312156103405761033f610277565b5b600061034e84828501610315565b9150509291505056fea264697066735822122095688cfd4ad788ba501c0c4b4524f1a2b759d1c67169bd5fd2bdee8a06e7747164736f6c63430008090033608060405234801561001057600080fd5b50610133806100206000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80634e47a3fe14603757806393a98a3b146051575b600080fd5b603d6069565b604051604891906090565b60405180910390f35b606760048036038101906063919060d5565b606f565b005b60005481565b8060008190555050565b6000819050919050565b608a816079565b82525050565b600060208201905060a360008301846083565b92915050565b600080fd5b60b5816079565b811460bf57600080fd5b50565b60008135905060cf8160ae565b92915050565b60006020828403121560e85760e760a9565b5b600060f48482850160c2565b9150509291505056fea264697066735822122099f8d71bc274278787f12b702f3b0431500a7668efc1e4fe25082230f4332de464736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.json
deleted file mode 100755
index 0589c69b5411..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"uint256","name":"slot","type":"uint256"},{"internalType":"uint256","name":"datum","type":"uint256"}],"name":"consumeA","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"slot","type":"uint256"}],"name":"consumeB","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"datum","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"slotA","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"slotB","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.bin
deleted file mode 100644
index 59c64464cb71..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610453806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806305b5191f146100515780636433cd5d14610066578063af47c6ef14610079578063e7092b411461008c575b600080fd5b61006461005f366004610311565b61009f565b005b610064610074366004610311565b61018f565b61006461008736600461034d565b610208565b61006461009a366004610398565b610283565b60405163095ea7b360e01b81526001600160a01b0383811660048301526024820183905230919085169063095ea7b3906044016020604051808303816000875af11580156100f1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061011591906103db565b50604051636eb1769f60e11b81526001600160a01b038281166004830152848116602483015285169063dd62ed3e90604401602060405180830381865afa158015610164573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101889190610404565b5050505050565b60405163095ea7b360e01b81526001600160a01b0383811660048301526024820183905284169063095ea7b3906044016020604051808303816000875af11580156101de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020291906103db565b50505050565b6040516323b872dd60e01b81526001600160a01b0384811660048301528381166024830152604482018390528516906323b872dd906064016020604051808303816000875af115801561025f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906103db565b604051636eb1769f60e11b81526001600160a01b038381166004830152828116602483015284169063dd62ed3e90604401602060405180830381865afa1580156102d1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102029190610404565b80356001600160a01b038116811461030c57600080fd5b919050565b60008060006060848603121561032657600080fd5b61032f846102f5565b925061033d602085016102f5565b9150604084013590509250925092565b6000806000806080858703121561036357600080fd5b61036c856102f5565b935061037a602086016102f5565b9250610388604086016102f5565b9396929550929360600135925050565b6000806000606084860312156103ad57600080fd5b6103b6846102f5565b92506103c4602085016102f5565b91506103d2604085016102f5565b90509250925092565b6000602082840312156103ed57600080fd5b815180151581146103fd57600080fd5b9392505050565b60006020828403121561041657600080fd5b505191905056fea2646970667358221220cbce009ba4dab673a026faa15e55f057eb729dffe0eddbb0ca33dd8fc20c666064736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.json
deleted file mode 100644
index 2000f3c1755c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.json
+++ /dev/null
@@ -1,99 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "approveAndGetAllowanceAmount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "doSpecificApproval",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "doTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      }
-    ],
-    "name": "getAllowance",
-    "outputs": [],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.bin
deleted file mode 100644
index b8829704e5ca..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50611b55806100206000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806357a9d3561161007157806357a9d356146101615780636433cd5d146101915780637c41ad2c146101ad5780639b85fe60146101dd578063d5d03e21146101f9578063f0ae95aa14610215576100b4565b80630208359d146100b9578063144fd5e9146100d557806315dacbea146100f1578063245341a11461010d57806328a595201461012957806353290b4414610145575b600080fd5b6100d360048036038101906100ce9190611033565b610245565b005b6100ef60048036038101906100ea9190611033565b610459565b005b61010b600480360381019061010691906110a9565b6105ea565b005b61012760048036038101906101229190611110565b61065f565b005b610143600480360381019061013e9190611110565b6106d1565b005b61015f600480360381019061015a9190611033565b610801565b005b61017b60048036038101906101769190611110565b610880565b604051610188919061115f565b60405180910390f35b6101ab60048036038101906101a6919061117a565b610904565b005b6101c760048036038101906101c291906111cd565b610976565b6040516101d49190611213565b60405180910390f35b6101f760048036038101906101f29190611266565b610a8b565b005b610213600480360381019061020e9190611110565b610afd565b005b61022f600480360381019061022a91906112b9565b610b7c565b60405161023c919061131b565b60405180910390f35b6000600267ffffffffffffffff81111561026257610261611336565b5b60405190808252806020026020018201604052801561029557816020015b60608152602001906001900390816102805790505b5090506040518060400160405280600181526020017fee00000000000000000000000000000000000000000000000000000000000000815250816000815181106102e2576102e1611365565b5b60200260200101819052506040518060400160405280600181526020017fff000000000000000000000000000000000000000000000000000000000000008152508160018151811061033757610336611365565b5b6020026020010181905250600030905060008061035686600086610c03565b92505091506016821461036857600080fd5b61038f8684878460008151811061038257610381611365565b5b6020026020010151610d7b565b91506016821461039e57600080fd5b6103c5868487846001815181106103b8576103b7611365565b5b6020026020010151610d7b565b9150601682146103d457600080fd5b6103fb868685846000815181106103ee576103ed611365565b5b6020026020010151610d7b565b91506016821461040a57600080fd5b6104318686858460018151811061042457610423611365565b5b6020026020010151610d7b565b91506016821461044057600080fd5b61044c86600083610e99565b5080925050505050505050565b6000600267ffffffffffffffff81111561047657610475611336565b5b6040519080825280602002602001820160405280156104a957816020015b60608152602001906001900390816104945790505b5090506040518060400160405280600181526020017fee00000000000000000000000000000000000000000000000000000000000000815250816000815181106104f6576104f5611365565b5b60200260200101819052506040518060400160405280600181526020017fff000000000000000000000000000000000000000000000000000000000000008152508160018151811061054b5761054a611365565b5b602002602001018190525060008061056585600085610c03565b92505091506016821461057757600080fd5b61059e8530868460008151811061059157610590611365565b5b6020026020010151610d7b565b9150601682146105ad57600080fd5b6105d4853086846001815181106105c7576105c6611365565b5b6020026020010151610d7b565b9150601682146105e357600080fd5b5050505050565b8373ffffffffffffffffffffffffffffffffffffffff166323b872dd8484846040518463ffffffff1660e01b8152600401610627939291906113a3565b600060405180830381600087803b15801561064157600080fd5b505af1158015610655573d6000803e3d6000fd5b5050505050505050565b8173ffffffffffffffffffffffffffffffffffffffff1663095ea7b36000836040518363ffffffff1660e01b815260040161069b9291906113da565b600060405180830381600087803b1580156106b557600080fd5b505af11580156106c9573d6000803e3d6000fd5b505050505050565b60003090508273ffffffffffffffffffffffffffffffffffffffff166323b872dd8233856040518463ffffffff1660e01b8152600401610713939291906113a3565b600060405180830381600087803b15801561072d57600080fd5b505af1158015610741573d6000803e3d6000fd5b5050505060008373ffffffffffffffffffffffffffffffffffffffff16636352211e846040518263ffffffff1660e01b81526004016107809190611403565b602060405180830381865afa15801561079d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107c19190611433565b90503373ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16146107fb57600080fd5b50505050565b8173ffffffffffffffffffffffffffffffffffffffff166370a08231826040518263ffffffff1660e01b815260040161083a919061115f565b602060405180830381865afa158015610857573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061087b9190611475565b505050565b60008273ffffffffffffffffffffffffffffffffffffffff1663081812fc836040518263ffffffff1660e01b81526004016108bb9190611403565b602060405180830381865afa1580156108d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108fc9190611433565b905092915050565b8273ffffffffffffffffffffffffffffffffffffffff1663095ea7b383836040518363ffffffff1660e01b815260040161093f9291906113da565b600060405180830381600087803b15801561095957600080fd5b505af115801561096d573d6000803e3d6000fd5b50505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016109ad919061115f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610a179190611513565b6000604051808303816000865af19150503d8060008114610a54576040519150601f19603f3d011682016040523d82523d6000602084013e610a59565b606091505b509150915081610a6a576015610a7f565b80806020019051810190610a7e9190611563565b5b60030b92505050919050565b8273ffffffffffffffffffffffffffffffffffffffff1663a22cb46583836040518363ffffffff1660e01b8152600401610ac6929190611590565b600060405180830381600087803b158015610ae057600080fd5b505af1158015610af4573d6000803e3d6000fd5b50505050505050565b8173ffffffffffffffffffffffffffffffffffffffff16636352211e826040518263ffffffff1660e01b8152600401610b369190611403565b602060405180830381865afa158015610b53573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b779190611433565b505050565b60008373ffffffffffffffffffffffffffffffffffffffff1663e985e9c584846040518363ffffffff1660e01b8152600401610bb99291906115b9565b602060405180830381865afa158015610bd6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bfa91906115f7565b90509392505050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b898989604051602401610c4193929190611764565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cab9190611513565b6000604051808303816000865af19150503d8060008114610ce8576040519150601f19603f3d011682016040523d82523d6000602084013e610ced565b606091505b509150915081610d4957601560008067ffffffffffffffff811115610d1557610d14611336565b5b604051908082528060200260200182016040528015610d435781602001602082028036833780820191505090505b50610d5e565b80806020019051810190610d5d9190611920565b5b8260030b9250809550819650829750505050505093509350939050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b88888888604051602401610db8949392919061199e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610e229190611513565b6000604051808303816000865af19150503d8060008114610e5f576040519150601f19603f3d011682016040523d82523d6000602084013e610e64565b606091505b509150915081610e75576015610e8a565b80806020019051810190610e899190611563565b5b60030b92505050949350505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b888888604051602401610ed593929190611aa1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f3f9190611513565b6000604051808303816000865af19150503d8060008114610f7c576040519150601f19603f3d011682016040523d82523d6000602084013e610f81565b606091505b509150915081610f945760156000610fa9565b80806020019051810190610fa89190611adf565b5b8160030b915080945081955050505050935093915050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061100082610fd5565b9050919050565b61101081610ff5565b811461101b57600080fd5b50565b60008135905061102d81611007565b92915050565b6000806040838503121561104a57611049610fcb565b5b60006110588582860161101e565b92505060206110698582860161101e565b9150509250929050565b6000819050919050565b61108681611073565b811461109157600080fd5b50565b6000813590506110a38161107d565b92915050565b600080600080608085870312156110c3576110c2610fcb565b5b60006110d18782880161101e565b94505060206110e28782880161101e565b93505060406110f38782880161101e565b925050606061110487828801611094565b91505092959194509250565b6000806040838503121561112757611126610fcb565b5b60006111358582860161101e565b925050602061114685828601611094565b9150509250929050565b61115981610ff5565b82525050565b60006020820190506111746000830184611150565b92915050565b60008060006060848603121561119357611192610fcb565b5b60006111a18682870161101e565b93505060206111b28682870161101e565b92505060406111c386828701611094565b9150509250925092565b6000602082840312156111e3576111e2610fcb565b5b60006111f18482850161101e565b91505092915050565b6000819050919050565b61120d816111fa565b82525050565b60006020820190506112286000830184611204565b92915050565b60008115159050919050565b6112438161122e565b811461124e57600080fd5b50565b6000813590506112608161123a565b92915050565b60008060006060848603121561127f5761127e610fcb565b5b600061128d8682870161101e565b935050602061129e8682870161101e565b92505060406112af86828701611251565b9150509250925092565b6000806000606084860312156112d2576112d1610fcb565b5b60006112e08682870161101e565b93505060206112f18682870161101e565b92505060406113028682870161101e565b9150509250925092565b6113158161122e565b82525050565b6000602082019050611330600083018461130c565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b61139d81611073565b82525050565b60006060820190506113b86000830186611150565b6113c56020830185611150565b6113d26040830184611394565b949350505050565b60006040820190506113ef6000830185611150565b6113fc6020830184611394565b9392505050565b60006020820190506114186000830184611394565b92915050565b60008151905061142d81611007565b92915050565b60006020828403121561144957611448610fcb565b5b60006114578482850161141e565b91505092915050565b60008151905061146f8161107d565b92915050565b60006020828403121561148b5761148a610fcb565b5b600061149984828501611460565b91505092915050565b600081519050919050565b600081905092915050565b60005b838110156114d65780820151818401526020810190506114bb565b60008484015250505050565b60006114ed826114a2565b6114f781856114ad565b93506115078185602086016114b8565b80840191505092915050565b600061151f82846114e2565b915081905092915050565b60008160030b9050919050565b6115408161152a565b811461154b57600080fd5b50565b60008151905061155d81611537565b92915050565b60006020828403121561157957611578610fcb565b5b60006115878482850161154e565b91505092915050565b60006040820190506115a56000830185611150565b6115b2602083018461130c565b9392505050565b60006040820190506115ce6000830185611150565b6115db6020830184611150565b9392505050565b6000815190506115f18161123a565b92915050565b60006020828403121561160d5761160c610fcb565b5b600061161b848285016115e2565b91505092915050565b600067ffffffffffffffff82169050919050565b61164181611624565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b6000601f19601f8301169050919050565b60006116a0826114a2565b6116aa8185611673565b93506116ba8185602086016114b8565b6116c381611684565b840191505092915050565b60006116da8383611695565b905092915050565b6000602082019050919050565b60006116fa82611647565b6117048185611652565b93508360208202850161171685611663565b8060005b85811015611752578484038952815161173385826116ce565b945061173e836116e2565b925060208a0199505060018101905061171a565b50829750879550505050505092915050565b60006060820190506117796000830186611150565b6117866020830185611638565b818103604083015261179881846116ef565b9050949350505050565b6117ab81611624565b81146117b657600080fd5b50565b6000815190506117c8816117a2565b92915050565b600080fd5b6117dc82611684565b810181811067ffffffffffffffff821117156117fb576117fa611336565b5b80604052505050565b600061180e610fc1565b905061181a82826117d3565b919050565b600067ffffffffffffffff82111561183a57611839611336565b5b602082029050602081019050919050565b600080fd5b60008160070b9050919050565b61186681611850565b811461187157600080fd5b50565b6000815190506118838161185d565b92915050565b600061189c6118978461181f565b611804565b905080838252602082019050602084028301858111156118bf576118be61184b565b5b835b818110156118e857806118d48882611874565b8452602084019350506020810190506118c1565b5050509392505050565b600082601f830112611907576119066117ce565b5b8151611917848260208601611889565b91505092915050565b60008060006060848603121561193957611938610fcb565b5b60006119478682870161154e565b9350506020611958868287016117b9565b925050604084015167ffffffffffffffff81111561197957611978610fd0565b5b611985868287016118f2565b9150509250925092565b61199881611850565b82525050565b60006080820190506119b36000830187611150565b6119c06020830186611150565b6119cd6040830185611150565b6119da606083018461198f565b95945050505050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b611a1881611850565b82525050565b6000611a2a8383611a0f565b60208301905092915050565b6000602082019050919050565b6000611a4e826119e3565b611a5881856119ee565b9350611a63836119ff565b8060005b83811015611a94578151611a7b8882611a1e565b9750611a8683611a36565b925050600181019050611a67565b5085935050505092915050565b6000606082019050611ab66000830186611150565b611ac36020830185611638565b8181036040830152611ad58184611a43565b9050949350505050565b60008060408385031215611af657611af5610fcb565b5b6000611b048582860161154e565b9250506020611b15858286016117b9565b915050925092905056fea2646970667358221220cecc63a3fef2018a5c38458a306a1b311a06e553a88d9d1cce0007b792a964cf64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.json
deleted file mode 100644
index df0f77fb64bb..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"doSpecificApproval","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"}],"name":"getBalanceOf","outputs":[],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"getOwnerOf","outputs":[],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"iMustOwnAfterReceiving","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"recipient","type":"address"}],"name":"nonSequiturMintAndTransfer","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"recipient","type":"address"}],"name":"nonSequiturMintAndTransferAndBurn","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"outerGetApproved","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"outerIsApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"outerSetApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"pauseToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"revokeSpecificApproval","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"serialNo","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.bin
deleted file mode 100644
index f93a4f605a10..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b506040516200130038038062001300833981810160405281019062000037919062000085565b8060008190555050620000b7565b600080fd5b6000819050919050565b6200005f816200004a565b81146200006b57600080fd5b50565b6000815190506200007f8162000054565b92915050565b6000602082840312156200009e576200009d62000045565b5b6000620000ae848285016200006e565b91505092915050565b61123980620000c76000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c8063547ff3541161008c5780637a5185ca116100665780637a5185ca146102bd578063bf1b1c5b146102ed578063d1efd30d1461031d578063fc63247d1461033b576100ea565b8063547ff3541461022d57806356ebb5081461025d5780636047bd151461028d576100ea565b80632977b4fc116100c85780632977b4fc1461017f5780632b9be463146101af5780632ce9a9eb146101cd5780634919b140146101fd576100ea565b806303eef7f2146100ef5780631412082d1461011f578063254f387c1461014f575b600080fd5b61010960048036038101906101049190610b4c565b61036b565b6040516101169190610b88565b60405180910390f35b61013960048036038101906101349190610c01565b61047a565b6040516101469190610cbe565b60405180910390f35b61016960048036038101906101649190610ce0565b6104f7565b6040516101769190610b88565b60405180910390f35b61019960048036038101906101949190610ce0565b61057b565b6040516101a69190610b88565b60405180910390f35b6101b76105ff565b6040516101c49190610d39565b60405180910390f35b6101e760048036038101906101e29190610d54565b610701565b6040516101f49190610da3565b60405180910390f35b61021760048036038101906102129190610c01565b610785565b6040516102249190610dda565b60405180910390f35b61024760048036038101906102429190610c01565b6107fd565b6040516102549190610cbe565b60405180910390f35b61027760048036038101906102729190610df5565b61087a565b6040516102849190610e63565b60405180910390f35b6102a760048036038101906102a29190610d54565b610901565b6040516102b49190610cbe565b60405180910390f35b6102d760048036038101906102d29190610c01565b61098a565b6040516102e49190610cbe565b60405180910390f35b61030760048036038101906103029190610c01565b610a07565b6040516103149190610b88565b60405180910390f35b610325610a7f565b6040516103329190610b88565b60405180910390f35b61035560048036038101906103509190610c01565b610a85565b6040516103629190610cbe565b60405180910390f35b600080600061016873ffffffffffffffffffffffffffffffffffffffff166343a8822960e01b856040516024016103a29190610b88565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161040c9190610ec5565b6000604051808303816000865af19150503d8060008114610449576040519150601f19603f3d011682016040523d82523d6000602084013e61044e565b606091505b50915091508161045d57600080fd5b808060200190518101906104719190610ef1565b92505050919050565b60608173ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa1580156104c7573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906104f09190611044565b9050919050565b60008273ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b81526004016105329190610da3565b602060405180830381865afa15801561054f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105739190610ef1565b905092915050565b60008273ffffffffffffffffffffffffffffffffffffffff166370a08231836040518263ffffffff1660e01b81526004016105b69190610da3565b602060405180830381865afa1580156105d3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f79190610ef1565b905092915050565b600080600061016973ffffffffffffffffffffffffffffffffffffffff1663d83bf9a160e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106959190610ec5565b6000604051808303816000865af19150503d80600081146106d2576040519150601f19603f3d011682016040523d82523d6000602084013e6106d7565b606091505b5091509150816106e657600080fd5b808060200190518101906106fa91906110b9565b9250505090565b60008273ffffffffffffffffffffffffffffffffffffffff16636352211e836040518263ffffffff1660e01b815260040161073c9190610b88565b602060405180830381865afa158015610759573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061077d91906110fb565b905092915050565b60008173ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107f69190611154565b9050919050565b60608173ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa15801561084a573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906108739190611044565b9050919050565b60008373ffffffffffffffffffffffffffffffffffffffff1663e985e9c584846040518363ffffffff1660e01b81526004016108b7929190611181565b602060405180830381865afa1580156108d4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108f891906111d6565b90509392505050565b60608273ffffffffffffffffffffffffffffffffffffffff1663c87b56dd836040518263ffffffff1660e01b815260040161093c9190610b88565b600060405180830381865afa158015610959573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906109829190611044565b905092915050565b60608173ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa1580156109d7573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610a009190611044565b9050919050565b60008173ffffffffffffffffffffffffffffffffffffffff166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a54573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a789190610ef1565b9050919050565b60005481565b60608173ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa158015610ad2573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610afb9190611044565b9050919050565b6000604051905090565b600080fd5b600080fd5b6000819050919050565b610b2981610b16565b8114610b3457600080fd5b50565b600081359050610b4681610b20565b92915050565b600060208284031215610b6257610b61610b0c565b5b6000610b7084828501610b37565b91505092915050565b610b8281610b16565b82525050565b6000602082019050610b9d6000830184610b79565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610bce82610ba3565b9050919050565b610bde81610bc3565b8114610be957600080fd5b50565b600081359050610bfb81610bd5565b92915050565b600060208284031215610c1757610c16610b0c565b5b6000610c2584828501610bec565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610c68578082015181840152602081019050610c4d565b60008484015250505050565b6000601f19601f8301169050919050565b6000610c9082610c2e565b610c9a8185610c39565b9350610caa818560208601610c4a565b610cb381610c74565b840191505092915050565b60006020820190508181036000830152610cd88184610c85565b905092915050565b60008060408385031215610cf757610cf6610b0c565b5b6000610d0585828601610bec565b9250506020610d1685828601610bec565b9150509250929050565b6000819050919050565b610d3381610d20565b82525050565b6000602082019050610d4e6000830184610d2a565b92915050565b60008060408385031215610d6b57610d6a610b0c565b5b6000610d7985828601610bec565b9250506020610d8a85828601610b37565b9150509250929050565b610d9d81610bc3565b82525050565b6000602082019050610db86000830184610d94565b92915050565b600060ff82169050919050565b610dd481610dbe565b82525050565b6000602082019050610def6000830184610dcb565b92915050565b600080600060608486031215610e0e57610e0d610b0c565b5b6000610e1c86828701610bec565b9350506020610e2d86828701610bec565b9250506040610e3e86828701610bec565b9150509250925092565b60008115159050919050565b610e5d81610e48565b82525050565b6000602082019050610e786000830184610e54565b92915050565b600081519050919050565b600081905092915050565b6000610e9f82610e7e565b610ea98185610e89565b9350610eb9818560208601610c4a565b80840191505092915050565b6000610ed18284610e94565b915081905092915050565b600081519050610eeb81610b20565b92915050565b600060208284031215610f0757610f06610b0c565b5b6000610f1584828501610edc565b91505092915050565b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610f6082610c74565b810181811067ffffffffffffffff82111715610f7f57610f7e610f28565b5b80604052505050565b6000610f92610b02565b9050610f9e8282610f57565b919050565b600067ffffffffffffffff821115610fbe57610fbd610f28565b5b610fc782610c74565b9050602081019050919050565b6000610fe7610fe284610fa3565b610f88565b90508281526020810184848401111561100357611002610f23565b5b61100e848285610c4a565b509392505050565b600082601f83011261102b5761102a610f1e565b5b815161103b848260208601610fd4565b91505092915050565b60006020828403121561105a57611059610b0c565b5b600082015167ffffffffffffffff81111561107857611077610b11565b5b61108484828501611016565b91505092915050565b61109681610d20565b81146110a157600080fd5b50565b6000815190506110b38161108d565b92915050565b6000602082840312156110cf576110ce610b0c565b5b60006110dd848285016110a4565b91505092915050565b6000815190506110f581610bd5565b92915050565b60006020828403121561111157611110610b0c565b5b600061111f848285016110e6565b91505092915050565b61113181610dbe565b811461113c57600080fd5b50565b60008151905061114e81611128565b92915050565b60006020828403121561116a57611169610b0c565b5b60006111788482850161113f565b91505092915050565b60006040820190506111966000830185610d94565b6111a36020830184610d94565b9392505050565b6111b381610e48565b81146111be57600080fd5b50565b6000815190506111d0816111aa565b92915050565b6000602082840312156111ec576111eb610b0c565b5b60006111fa848285016111c1565b9150509291505056fea26469706673582212203876551b6d6a7aac7b9aa3248e54f983ac137cc2623163a53aa3f490111eaffe64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.json
deleted file mode 100644
index f836c14aa5a9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"uint256","name":"_secret","type":"uint256"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"account","type":"address"}],"name":"getErc20Balance","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc20Decimals","outputs":[{"internalType":"uint8","name":"decimals","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc20Name","outputs":[{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc20Supply","outputs":[{"internalType":"uint256","name":"supply","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc20Symbol","outputs":[{"internalType":"string","name":"symbol","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"}],"name":"getErc721Balance","outputs":[{"internalType":"uint256","name":"balance","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"getErc721IsOperator","outputs":[{"internalType":"bool","name":"isOperator","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc721Name","outputs":[{"internalType":"string","name":"name","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getErc721Owner","outputs":[{"internalType":"address","name":"owner","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"getErc721Symbol","outputs":[{"internalType":"string","name":"symbol","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getErc721TokenUri","outputs":[{"internalType":"string","name":"tokenUri","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getPrngSeed","outputs":[{"internalType":"bytes32","name":"entropy","type":"bytes32"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"tinybars","type":"uint256"}],"name":"getTinycentsEquiv","outputs":[{"internalType":"uint256","name":"tinycents","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"secret","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.bin
deleted file mode 100644
index 2234339db2de..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50612a6f806100206000396000f3fe608060405234801561001057600080fd5b506004361061027f5760003560e01c80636ef3d3ab1161015c578063a78bdf39116100ce578063d582223911610087578063d5822239146106a5578063e220c318146106c3578063ed82777c146106df578063f71647ef146106fb578063f79b059f14610717578063f945bc26146107355761027f565b8063a78bdf3914610609578063b47bb98114610627578063ba525ac014610631578063c88ac73d1461064d578063ccd685711461066b578063cf93a442146106875761027f565b80638c1d2db8116101205780638c1d2db81461055b57806391aa423a146105795780639b9dfb62146105955780639e855d02146105b1578063a2ccbe1b146105cf578063a4ac27f3146105eb5761027f565b80636ef3d3ab146104c757806370c6234f146104e557806373061ce414610503578063801d190e146105215780638b7901e21461053f5761027f565b8063330cdc94116101f5578063530b65ad116101b9578063530b65ad1461042a578063636156721461044657806365618c2514610465578063664c8d9d146104815780636b83cbf11461049f5780636c60cd75146104bd5761027f565b8063330cdc94146103be578063387d9f04146103c85780633a261a2b146103e65780634112b645146103f0578063451ea5a61461040e5761027f565b80631f28d0a1116102475780631f28d0a114610310578063214d3c991461032c57806322a410f21461034a57806328d522b11461036657806330467dd91461038457806331a6439f146103a25761027f565b806301af096c14610284578063098328ec146102a05780631417aa4f146102bc57806319aeb7ea146102d85780631dd36ffe146102f4575b600080fd5b61029e6004803603810190610299919061140e565b610753565b005b6102ba60048036038101906102b59190611460565b610792565b005b6102d660048036038101906102d191906114f2565b6107bf565b005b6102f260048036038101906102ed9190611578565b610815565b005b61030e600480360381019061030991906115de565b610836565b005b61032a60048036038101906103259190611647565b610854565b005b610334610878565b604051610341919061168d565b60405180910390f35b610364600480360381019061035f91906117e9565b610882565b005b61036e6108b7565b60405161037b919061184e565b60405180910390f35b61038c6108ce565b6040516103999190611886565b60405180910390f35b6103bc60048036038101906103b791906118da565b6108e5565b005b6103c6610908565b005b6103d0610918565b6040516103dd9190611916565b60405180910390f35b6103ee61092f565b005b6103f861099a565b6040516104059190611940565b60405180910390f35b610428600480360381019061042391906119a3565b6109b1565b005b610444600480360381019061043f9190611a08565b6109ed565b005b61044e610a09565b60405161045c929190611afd565b60405180910390f35b61047f600480360381019061047a9190611b74565b610abc565b005b610489610ae8565b6040516104969190611bb0565b60405180910390f35b6104a7610b05565b6040516104b49190611bda565b60405180910390f35b6104c5610b0f565b005b6104cf610b2d565b6040516104dc9190611c04565b60405180910390f35b6104ed610b52565b6040516104fa9190611c38565b60405180910390f35b61050b610b5c565b6040516105189190611c62565b60405180910390f35b610529610b72565b6040516105369190611cfc565b60405180910390f35b61055960048036038101906105549190611d7c565b610c04565b005b610563610c48565b6040516105709190611db8565b60405180910390f35b610593600480360381019061058e91906117e9565b610c5f565b005b6105af60048036038101906105aa9190611dff565b610c72565b005b6105b9610c92565b6040516105c69190611e3b565b60405180910390f35b6105e960048036038101906105e49190611e8f565b610cbc565b005b6105f3610ceb565b6040516106009190611cfc565b60405180910390f35b610611610d7d565b60405161061e91906120b4565b60405180910390f35b61062f610fb8565b005b61064b60048036038101906106469190612102565b61103a565b005b610655611044565b604051610662919061213e565b60405180910390f35b61068560048036038101906106809190612185565b61105d565b005b61068f611067565b60405161069c91906121c1565b60405180910390f35b6106ad61107e565b6040516106ba919061223b565b60405180910390f35b6106dd60048036038101906106d89190612282565b6110a8565b005b6106f960048036038101906106f491906122db565b6110cf565b005b610715600480360381019061071091906124dd565b6110d9565b005b61071f6111b6565b60405161072c9190612535565b60405180910390f35b61073d6111cc565b60405161074a919061255f565b60405180910390f35b806002600f6101000a8154816fffffffffffffffffffffffffffffffff0219169083600f0b6fffffffffffffffffffffffffffffffff16021790555050565b80600860006101000a81548160ff021916908360038111156107b7576107b6611f24565b5b021790555050565b8181600991906107d09291906111e3565b50600060099050808054806107e8576107e761257a565b5b6001900381819060005260206000200160009055905580600a90805461080f929190611230565b50505050565b80600260006101000a81548160ff021916908360000b60ff16021790555050565b80600060016101000a81548160ff021916908360ff16021790555050565b80600060046101000a81548163ffffffff021916908363ffffffff16021790555050565b6000600354905090565b600b816040516020016108969291906126dd565b604051602081830303815290604052600b90816108b3919061288e565b5050565b6000600260039054906101000a900460030b905090565b60008060029054906101000a900461ffff16905090565b80600260016101000a81548161ffff021916908360010b61ffff16021790555050565b600b60006109169190611282565b565b60006002600f9054906101000a9004600f0b905090565b60405161093b906112c2565b604051809103906000f080158015610957573d6000803e3d6000fd5b50600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b6000600260019054906101000a900460010b905090565b80600060106101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff16021790555050565b806000806101000a81548160ff02191690831515021790555050565b6060806009600a81805480602002602001604051908101604052809291908181526020018280548015610a5b57602002820191906000526020600020905b815481526020019060010190808311610a47575b5050505050915080805480602002602001604051908101604052809291908181526020018280548015610aad57602002820191906000526020600020905b815481526020019060010190808311610a99575b50505050509050915091509091565b80600060086101000a81548167ffffffffffffffff021916908367ffffffffffffffff16021790555050565b60008060089054906101000a900467ffffffffffffffff16905090565b6000600154905090565b60096000610b1d91906112ce565b600a6000610b2b91906112ce565b565b60008060109054906101000a90046fffffffffffffffffffffffffffffffff16905090565b6000600654905090565b60008060019054906101000a900460ff16905090565b6060600b8054610b81906125d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610bad906125d8565b8015610bfa5780601f10610bcf57610100808354040283529160200191610bfa565b820191906000526020600020905b815481529060010190602001808311610bdd57829003601f168201915b5050505050905090565b80600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000600260009054906101000a900460000b905090565b8060079081610c6e919061288e565b5050565b80600060026101000a81548161ffff021916908361ffff16021790555050565b6000600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b80600260076101000a81548167ffffffffffffffff021916908360070b67ffffffffffffffff16021790555050565b606060078054610cfa906125d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610d26906125d8565b8015610d735780601f10610d4857610100808354040283529160200191610d73565b820191906000526020600020905b815481529060010190602001808311610d5657829003601f168201915b5050505050905090565b610d856112ef565b600c6040518060e0016040529081600082015481526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200160028201548152602001600382018054610e0c906125d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610e38906125d8565b8015610e855780601f10610e5a57610100808354040283529160200191610e85565b820191906000526020600020905b815481529060010190602001808311610e6857829003601f168201915b505050505081526020016004820160009054906101000a900460ff166003811115610eb357610eb2611f24565b5b6003811115610ec557610ec4611f24565b5b815260200160058201805480602002602001604051908101604052809291908181526020018280548015610f1857602002820191906000526020600020905b815481526020019060010190808311610f04575b50505050508152602001600682018054610f31906125d8565b80601f0160208091040260200160405190810160405280929190818152602001828054610f5d906125d8565b8015610faa5780601f10610f7f57610100808354040283529160200191610faa565b820191906000526020600020905b815481529060010190602001808311610f8d57829003601f168201915b505050505081525050905090565b600c6000808201600090556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560028201600090556003820160006110029190611282565b6004820160006101000a81549060ff021916905560058201600061102691906112ce565b6006820160006110369190611282565b5050565b8060018190555050565b60008060049054906101000a900463ffffffff16905090565b8060038190555050565b6000600260079054906101000a900460070b905090565b6000600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b80600260036101000a81548163ffffffff021916908360030b63ffffffff16021790555050565b8060068190555050565b80600c6000820151816000015560208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160020155606082015181600301908161114c919061288e565b5060808201518160040160006101000a81548160ff0219169083600381111561117857611177611f24565b5b021790555060a0820151816005019080519060200190611199929190611357565b5060c08201518160060190816111af919061288e565b5090505050565b60008060009054906101000a900460ff16905090565b6000600860009054906101000a900460ff16905090565b82805482825590600052602060002090810192821561121f579160200282015b8281111561121e578235825591602001919060010190611203565b5b50905061122c91906113a4565b5090565b8280548282559060005260206000209081019282156112715760005260206000209182015b82811115611270578254825591600101919060010190611255565b5b50905061127e91906113a4565b5090565b50805461128e906125d8565b6000825580601f106112a057506112bf565b601f0160209004906000526020600020908101906112be91906113a4565b5b50565b60d98061296183390190565b50805460008255906000526020600020908101906112ec91906113a4565b50565b6040518060e0016040528060008152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008019168152602001606081526020016000600381111561134357611342611f24565b5b815260200160608152602001606081525090565b828054828255906000526020600020908101928215611393579160200282015b82811115611392578251825591602001919060010190611377565b5b5090506113a091906113a4565b5090565b5b808211156113bd5760008160009055506001016113a5565b5090565b6000604051905090565b600080fd5b600080fd5b600081600f0b9050919050565b6113eb816113d5565b81146113f657600080fd5b50565b600081359050611408816113e2565b92915050565b600060208284031215611424576114236113cb565b5b6000611432848285016113f9565b91505092915050565b6004811061144857600080fd5b50565b60008135905061145a8161143b565b92915050565b600060208284031215611476576114756113cb565b5b60006114848482850161144b565b91505092915050565b600080fd5b600080fd5b600080fd5b60008083601f8401126114b2576114b161148d565b5b8235905067ffffffffffffffff8111156114cf576114ce611492565b5b6020830191508360208202830111156114eb576114ea611497565b5b9250929050565b60008060208385031215611509576115086113cb565b5b600083013567ffffffffffffffff811115611527576115266113d0565b5b6115338582860161149c565b92509250509250929050565b60008160000b9050919050565b6115558161153f565b811461156057600080fd5b50565b6000813590506115728161154c565b92915050565b60006020828403121561158e5761158d6113cb565b5b600061159c84828501611563565b91505092915050565b600060ff82169050919050565b6115bb816115a5565b81146115c657600080fd5b50565b6000813590506115d8816115b2565b92915050565b6000602082840312156115f4576115f36113cb565b5b6000611602848285016115c9565b91505092915050565b600063ffffffff82169050919050565b6116248161160b565b811461162f57600080fd5b50565b6000813590506116418161161b565b92915050565b60006020828403121561165d5761165c6113cb565b5b600061166b84828501611632565b91505092915050565b6000819050919050565b61168781611674565b82525050565b60006020820190506116a2600083018461167e565b92915050565b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6116f6826116ad565b810181811067ffffffffffffffff82111715611715576117146116be565b5b80604052505050565b60006117286113c1565b905061173482826116ed565b919050565b600067ffffffffffffffff821115611754576117536116be565b5b61175d826116ad565b9050602081019050919050565b82818337600083830152505050565b600061178c61178784611739565b61171e565b9050828152602081018484840111156117a8576117a76116a8565b5b6117b384828561176a565b509392505050565b600082601f8301126117d0576117cf61148d565b5b81356117e0848260208601611779565b91505092915050565b6000602082840312156117ff576117fe6113cb565b5b600082013567ffffffffffffffff81111561181d5761181c6113d0565b5b611829848285016117bb565b91505092915050565b60008160030b9050919050565b61184881611832565b82525050565b6000602082019050611863600083018461183f565b92915050565b600061ffff82169050919050565b61188081611869565b82525050565b600060208201905061189b6000830184611877565b92915050565b60008160010b9050919050565b6118b7816118a1565b81146118c257600080fd5b50565b6000813590506118d4816118ae565b92915050565b6000602082840312156118f0576118ef6113cb565b5b60006118fe848285016118c5565b91505092915050565b611910816113d5565b82525050565b600060208201905061192b6000830184611907565b92915050565b61193a816118a1565b82525050565b60006020820190506119556000830184611931565b92915050565b60006fffffffffffffffffffffffffffffffff82169050919050565b6119808161195b565b811461198b57600080fd5b50565b60008135905061199d81611977565b92915050565b6000602082840312156119b9576119b86113cb565b5b60006119c78482850161198e565b91505092915050565b60008115159050919050565b6119e5816119d0565b81146119f057600080fd5b50565b600081359050611a02816119dc565b92915050565b600060208284031215611a1e57611a1d6113cb565b5b6000611a2c848285016119f3565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6000819050919050565b611a7481611a61565b82525050565b6000611a868383611a6b565b60208301905092915050565b6000602082019050919050565b6000611aaa82611a35565b611ab48185611a40565b9350611abf83611a51565b8060005b83811015611af0578151611ad78882611a7a565b9750611ae283611a92565b925050600181019050611ac3565b5085935050505092915050565b60006040820190508181036000830152611b178185611a9f565b90508181036020830152611b2b8184611a9f565b90509392505050565b600067ffffffffffffffff82169050919050565b611b5181611b34565b8114611b5c57600080fd5b50565b600081359050611b6e81611b48565b92915050565b600060208284031215611b8a57611b896113cb565b5b6000611b9884828501611b5f565b91505092915050565b611baa81611b34565b82525050565b6000602082019050611bc56000830184611ba1565b92915050565b611bd481611a61565b82525050565b6000602082019050611bef6000830184611bcb565b92915050565b611bfe8161195b565b82525050565b6000602082019050611c196000830184611bf5565b92915050565b6000819050919050565b611c3281611c1f565b82525050565b6000602082019050611c4d6000830184611c29565b92915050565b611c5c816115a5565b82525050565b6000602082019050611c776000830184611c53565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611cb7578082015181840152602081019050611c9c565b60008484015250505050565b6000611cce82611c7d565b611cd88185611c88565b9350611ce8818560208601611c99565b611cf1816116ad565b840191505092915050565b60006020820190508181036000830152611d168184611cc3565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611d4982611d1e565b9050919050565b611d5981611d3e565b8114611d6457600080fd5b50565b600081359050611d7681611d50565b92915050565b600060208284031215611d9257611d916113cb565b5b6000611da084828501611d67565b91505092915050565b611db28161153f565b82525050565b6000602082019050611dcd6000830184611da9565b92915050565b611ddc81611869565b8114611de757600080fd5b50565b600081359050611df981611dd3565b92915050565b600060208284031215611e1557611e146113cb565b5b6000611e2384828501611dea565b91505092915050565b611e3581611d3e565b82525050565b6000602082019050611e506000830184611e2c565b92915050565b60008160070b9050919050565b611e6c81611e56565b8114611e7757600080fd5b50565b600081359050611e8981611e63565b92915050565b600060208284031215611ea557611ea46113cb565b5b6000611eb384828501611e7a565b91505092915050565b611ec581611d3e565b82525050565b611ed481611c1f565b82525050565b600082825260208201905092915050565b6000611ef682611c7d565b611f008185611eda565b9350611f10818560208601611c99565b611f19816116ad565b840191505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60048110611f6457611f63611f24565b5b50565b6000819050611f7582611f53565b919050565b6000611f8582611f67565b9050919050565b611f9581611f7a565b82525050565b600082825260208201905092915050565b6000611fb782611a35565b611fc18185611f9b565b9350611fcc83611a51565b8060005b83811015611ffd578151611fe48882611a7a565b9750611fef83611a92565b925050600181019050611fd0565b5085935050505092915050565b600060e0830160008301516120226000860182611a6b565b5060208301516120356020860182611ebc565b5060408301516120486040860182611ecb565b50606083015184820360608601526120608282611eeb565b91505060808301516120756080860182611f8c565b5060a083015184820360a086015261208d8282611fac565b91505060c083015184820360c08601526120a78282611eeb565b9150508091505092915050565b600060208201905081810360008301526120ce818461200a565b905092915050565b6120df81611a61565b81146120ea57600080fd5b50565b6000813590506120fc816120d6565b92915050565b600060208284031215612118576121176113cb565b5b6000612126848285016120ed565b91505092915050565b6121388161160b565b82525050565b6000602082019050612153600083018461212f565b92915050565b61216281611674565b811461216d57600080fd5b50565b60008135905061217f81612159565b92915050565b60006020828403121561219b5761219a6113cb565b5b60006121a984828501612170565b91505092915050565b6121bb81611e56565b82525050565b60006020820190506121d660008301846121b2565b92915050565b6000819050919050565b60006122016121fc6121f784611d1e565b6121dc565b611d1e565b9050919050565b6000612213826121e6565b9050919050565b600061222582612208565b9050919050565b6122358161221a565b82525050565b6000602082019050612250600083018461222c565b92915050565b61225f81611832565b811461226a57600080fd5b50565b60008135905061227c81612256565b92915050565b600060208284031215612298576122976113cb565b5b60006122a68482850161226d565b91505092915050565b6122b881611c1f565b81146122c357600080fd5b50565b6000813590506122d5816122af565b92915050565b6000602082840312156122f1576122f06113cb565b5b60006122ff848285016122c6565b91505092915050565b600080fd5b600080fd5b600067ffffffffffffffff82111561232d5761232c6116be565b5b602082029050602081019050919050565b600061235161234c84612312565b61171e565b9050808382526020820190506020840283018581111561237457612373611497565b5b835b8181101561239d578061238988826120ed565b845260208401935050602081019050612376565b5050509392505050565b600082601f8301126123bc576123bb61148d565b5b81356123cc84826020860161233e565b91505092915050565b600060e082840312156123eb576123ea612308565b5b6123f560e061171e565b90506000612405848285016120ed565b600083015250602061241984828501611d67565b602083015250604061242d848285016122c6565b604083015250606082013567ffffffffffffffff8111156124515761245061230d565b5b61245d848285016117bb565b60608301525060806124718482850161144b565b60808301525060a082013567ffffffffffffffff8111156124955761249461230d565b5b6124a1848285016123a7565b60a08301525060c082013567ffffffffffffffff8111156124c5576124c461230d565b5b6124d1848285016117bb565b60c08301525092915050565b6000602082840312156124f3576124f26113cb565b5b600082013567ffffffffffffffff811115612511576125106113d0565b5b61251d848285016123d5565b91505092915050565b61252f816119d0565b82525050565b600060208201905061254a6000830184612526565b92915050565b61255981611f7a565b82525050565b60006020820190506125746000830184612550565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806125f057607f821691505b602082108103612603576126026125a9565b5b50919050565b600081905092915050565b60008190508160005260206000209050919050565b60008154612636816125d8565b6126408186612609565b9450600182166000811461265b5760018114612670576126a3565b60ff19831686528115158202860193506126a3565b61267985612614565b60005b8381101561269b5781548189015260018201915060208101905061267c565b838801955050505b50505092915050565b60006126b782611c7d565b6126c18185612609565b93506126d1818560208601611c99565b80840191505092915050565b60006126e98285612629565b91506126f582846126ac565b91508190509392505050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261274e7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82612711565b6127588683612711565b95508019841693508086168417925050509392505050565b600061278b61278661278184611a61565b6121dc565b611a61565b9050919050565b6000819050919050565b6127a583612770565b6127b96127b182612792565b84845461271e565b825550505050565b600090565b6127ce6127c1565b6127d981848461279c565b505050565b5b818110156127fd576127f26000826127c6565b6001810190506127df565b5050565b601f8211156128425761281381612614565b61281c84612701565b8101602085101561282b578190505b61283f61283785612701565b8301826127de565b50505b505050565b600082821c905092915050565b600061286560001984600802612847565b1980831691505092915050565b600061287e8383612854565b9150826002028217905092915050565b61289782611c7d565b67ffffffffffffffff8111156128b0576128af6116be565b5b6128ba82546125d8565b6128c5828285612801565b600060209050601f8311600181146128f857600084156128e6578287015190505b6128f08582612872565b865550612958565b601f19841661290686612614565b60005b8281101561292e57848901518255600182019150602085019450602081019050612909565b8683101561294b5784890151612947601f891682612854565b8355505b6001600288020188555050505b50505050505056fe608060405234801561001057600080fd5b504360008190555060b3806100266000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80638381f58a14602d575b600080fd5b60336047565b604051603e91906064565b60405180910390f35b60005481565b6000819050919050565b605e81604d565b82525050565b6000602082019050607760008301846057565b9291505056fea2646970667358221220719ffefb243bf1adc401134f5e195237dfda17536ba557ab04c71885969dfbf864736f6c63430008100033a26469706673582212203cf8d90ea2e6932e7f6eec7045319776a3bfdf273c2f7c80ac37436333f0977e64736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.json
deleted file mode 100644
index 809fa2f8b894..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"deleteVarContractStruct","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"deleteVarIntArrDataAlloc","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"deleteVarStringConcat","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"getVarAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarBool","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarBytes32","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarContractStruct","outputs":[{"components":[{"internalType":"uint256","name":"varUint256","type":"uint256"},{"internalType":"address","name":"varAddress","type":"address"},{"internalType":"bytes32","name":"varBytes32","type":"bytes32"},{"internalType":"string","name":"varString","type":"string"},{"internalType":"enum Choices","name":"varContractType","type":"uint8"},{"internalType":"uint256[]","name":"varUint256Arr","type":"uint256[]"},{"internalType":"string","name":"varStringConcat","type":"string"}],"internalType":"struct ContractStruct","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarContractType","outputs":[{"internalType":"contract ContractType","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarEnum","outputs":[{"internalType":"enum Choices","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt128","outputs":[{"internalType":"int128","name":"","type":"int128"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt16","outputs":[{"internalType":"int16","name":"","type":"int16"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt256","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt32","outputs":[{"internalType":"int32","name":"","type":"int32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt64","outputs":[{"internalType":"int64","name":"","type":"int64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarInt8","outputs":[{"internalType":"int8","name":"","type":"int8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarIntArrDataAlloc","outputs":[{"internalType":"uint256[]","name":"","type":"uint256[]"},{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarString","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarStringConcat","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint128","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint16","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint256","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint32","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint64","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getVarUint8","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"newVar","type":"address"}],"name":"setVarAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bool","name":"newVar","type":"bool"}],"name":"setVarBool","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"newVar","type":"bytes32"}],"name":"setVarBytes32","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"varUint256","type":"uint256"},{"internalType":"address","name":"varAddress","type":"address"},{"internalType":"bytes32","name":"varBytes32","type":"bytes32"},{"internalType":"string","name":"varString","type":"string"},{"internalType":"enum Choices","name":"varContractType","type":"uint8"},{"internalType":"uint256[]","name":"varUint256Arr","type":"uint256[]"},{"internalType":"string","name":"varStringConcat","type":"string"}],"internalType":"struct ContractStruct","name":"newVar","type":"tuple"}],"name":"setVarContractStruct","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"setVarContractType","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"enum Choices","name":"newVar","type":"uint8"}],"name":"setVarEnum","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int128","name":"newVar","type":"int128"}],"name":"setVarInt128","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int16","name":"newVar","type":"int16"}],"name":"setVarInt16","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int256","name":"newVar","type":"int256"}],"name":"setVarInt256","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int32","name":"newVar","type":"int32"}],"name":"setVarInt32","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int64","name":"newVar","type":"int64"}],"name":"setVarInt64","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int8","name":"newVar","type":"int8"}],"name":"setVarInt8","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256[]","name":"newVar","type":"uint256[]"}],"name":"setVarIntArrDataAlloc","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"newVar","type":"string"}],"name":"setVarString","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"newVar","type":"string"}],"name":"setVarStringConcat","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint128","name":"newVar","type":"uint128"}],"name":"setVarUint128","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint16","name":"newVar","type":"uint16"}],"name":"setVarUint16","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"newVar","type":"uint256"}],"name":"setVarUint256","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint32","name":"newVar","type":"uint32"}],"name":"setVarUint32","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint64","name":"newVar","type":"uint64"}],"name":"setVarUint64","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint8","name":"newVar","type":"uint8"}],"name":"setVarUint8","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.bin
deleted file mode 100644
index 6cc1c3d9c048..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610c1e380380610c1e8339818101604052810190610032919061008d565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506100ff565b600081519050610087816100e8565b92915050565b60006020828403121561009f57600080fd5b60006100ad84828501610078565b91505092915050565b60006100c1826100c8565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6100f1816100b6565b81146100fc57600080fd5b50565b610b108061010e6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635b33f602146100465780639f325e6714610062578063d2d33b4f1461007e575b600080fd5b610060600480360381019061005b919061062d565b61009a565b005b61007c6004803603810190610077919061058e565b610200565b005b610098600480360381019061009391906105f1565b610369565b005b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168585856040516024016100ea939291906108bc565b6040516020818303038152906040527f1a1eb403000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516101749190610837565b600060405180830381855afa9150503d80600081146101af576040519150601f19603f3d011682016040523d82523d6000602084013e6101b4565b606091505b5091509150816101f9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f09061091a565b60405180910390fd5b5050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686868686604051602401610252949392919061084e565b6040516020818303038152906040527fa4aa39b1000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102dc9190610837565b600060405180830381855afa9150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915081610361576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103589061093a565b60405180910390fd5b505050505050565b6000606060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1684846040516024016103b7929190610893565b6040516020818303038152906040527fc7b2d336000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104419190610837565b600060405180830381855afa9150503d806000811461047c576040519150601f19603f3d011682016040523d82523d6000602084013e610481565b606091505b5091509150816104c6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104bd906108fa565b60405180910390fd5b50505050565b6000813590506104db81610a95565b92915050565b600082601f8301126104f257600080fd5b813561050561050082610987565b61095a565b9150818183526020840193506020810190508385602084028201111561052a57600080fd5b60005b8381101561055a57816105408882610564565b84526020840193506020830192505060018101905061052d565b5050505092915050565b60008135905061057381610aac565b92915050565b60008135905061058881610ac3565b92915050565b600080600080608085870312156105a457600080fd5b60006105b2878288016104cc565b94505060206105c3878288016104cc565b93505060406105d4878288016104cc565b92505060606105e587828801610564565b91505092959194509250565b6000806040838503121561060457600080fd5b6000610612858286016104cc565b925050602061062385828601610579565b9150509250929050565b60008060006060848603121561064257600080fd5b6000610650868287016104cc565b935050602061066186828701610579565b925050604084013567ffffffffffffffff81111561067e57600080fd5b61068a868287016104e1565b9150509250925092565b60006106a0838361074a565b60208301905092915050565b6106b581610a0f565b82525050565b60006106c6826109bf565b6106d081856109e2565b93506106db836109af565b8060005b8381101561070c5781516106f38882610694565b97506106fe836109d5565b9250506001810190506106df565b5085935050505092915050565b6000610724826109ca565b61072e81856109f3565b935061073e818560208601610a62565b80840191505092915050565b61075381610a21565b82525050565b61076281610a21565b82525050565b60006107756018836109fe565b91507f537461746963206d696e742063616c6c206661696c65642100000000000000006000830152602082019050919050565b60006107b56018836109fe565b91507f537461746963206275726e2063616c6c206661696c65642100000000000000006000830152602082019050919050565b60006107f5601c836109fe565b91507f537461746963207472616e736665722063616c6c206661696c656421000000006000830152602082019050919050565b61083181610a4e565b82525050565b60006108438284610719565b915081905092915050565b600060808201905061086360008301876106ac565b61087060208301866106ac565b61087d60408301856106ac565b61088a6060830184610759565b95945050505050565b60006040820190506108a860008301856106ac565b6108b56020830184610828565b9392505050565b60006060820190506108d160008301866106ac565b6108de6020830185610828565b81810360408301526108f081846106bb565b9050949350505050565b6000602082019050818103600083015261091381610768565b9050919050565b60006020820190508181036000830152610933816107a8565b9050919050565b60006020820190508181036000830152610953816107e8565b9050919050565b6000604051905081810181811067ffffffffffffffff8211171561097d57600080fd5b8060405250919050565b600067ffffffffffffffff82111561099e57600080fd5b602082029050602081019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000610a1a82610a2e565b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600067ffffffffffffffff82169050919050565b60005b83811015610a80578082015181840152602081019050610a65565b83811115610a8f576000848401525b50505050565b610a9e81610a0f565b8114610aa957600080fd5b50565b610ab581610a21565b8114610ac057600080fd5b50565b610acc81610a4e565b8114610ad757600080fd5b5056fea2646970667358221220a2ea29357b29c2a7df3289962a5850ef7db6c81a3720072111be20b25b5d67f664736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.json
deleted file mode 100644
index 65e710086b64..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.json
+++ /dev/null
@@ -1,82 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "serviceContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "burnStaticCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      }
-    ],
-    "name": "mintStaticCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "transferStaticCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.bin
deleted file mode 100644
index 6eaadfb8c26e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260898060116000396000f3fe60806040526004361060255760003560e01c806230146e14602a578063598fdeb814604d575b600080fd5b348015603557600080fd5b5060015b604051901515815260200160405180910390f35b6001603956fea2646970667358221220c4b679642f3b1f7e14be766fea59a5d8ff71c5aa2f86233adacff5c5bac428d864736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.json b/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.json
deleted file mode 100644
index f488ac7a91c9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "nonPayableReceive",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "receiveTinybars",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contract",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "subLevelNonPayableCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.bin
deleted file mode 100644
index 07b1d3df5bb0..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526000805534801561001457600080fd5b5060e7806100236000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063df3ad751146037578063e040db96146062575b600080fd5b606060048036036020811015604b57600080fd5b8101908080359060200190929190505050608d565b005b608b60048036036020811015607657600080fd5b8101908080359060200190929190505050609e565b005b806000819055506000808190555050565b80600081905550600181016000819055505056fea265627a7a72315820fa7008902ac5c95fb62d37dce233500f0313d3ce5463030fa17adedef0bad84c64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.json
deleted file mode 100644
index 86916c952c37..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_permanentValue",
-        "type": "uint256"
-      }
-    ],
-    "name": "holdPermanently",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_tempValue",
-        "type": "uint256"
-      }
-    ],
-    "name": "holdTemporary",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.bin
deleted file mode 100644
index 957254d39313..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.bin
+++ /dev/null
@@ -1 +0,0 @@
-60c06040523480156200001157600080fd5b5060405162000f2e38038062000f2e83398181016040528101906200003791906200042a565b60006200005030846200017960201b620002c31760201c565b9050601660030b81146200009b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200009290620004d2565b60405180910390fd5b6000600a90506000620000bb8585846200029b60201b620003db1760201c565b9050601660030b811462000106576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620000fd9062000544565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff1660808173ffffffffffffffffffffffffffffffffffffffff16815250508373ffffffffffffffffffffffffffffffffffffffff1660a08173ffffffffffffffffffffffffffffffffffffffff16815250505050505050620006fe565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401620001b492919062000577565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200022091906200061d565b6000604051808303816000865af19150503d80600081146200025f576040519150601f19603f3d011682016040523d82523d6000602084013e62000264565b606091505b509150915081620002775760156200028e565b808060200190518101906200028d919062000674565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b878787604051602401620002d893929190620006c1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516200034491906200061d565b6000604051808303816000865af19150503d806000811462000383576040519150601f19603f3d011682016040523d82523d6000602084013e62000388565b606091505b5091509150816200039b576015620003b2565b80806020019051810190620003b1919062000674565b5b60030b925050509392505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003f282620003c5565b9050919050565b6200040481620003e5565b81146200041057600080fd5b50565b6000815190506200042481620003f9565b92915050565b60008060408385031215620004445762000443620003c0565b5b6000620004548582860162000413565b9250506020620004678582860162000413565b9150509250929050565b600082825260208201905092915050565b7f4173736f63696174696f6e206661696c65640000000000000000000000000000600082015250565b6000620004ba60128362000471565b9150620004c78262000482565b602082019050919050565b60006020820190508181036000830152620004ed81620004ab565b9050919050565b7f417070726f76616c206661696c65640000000000000000000000000000000000600082015250565b60006200052c600f8362000471565b91506200053982620004f4565b602082019050919050565b600060208201905081810360008301526200055f816200051d565b9050919050565b6200057181620003e5565b82525050565b60006040820190506200058e600083018562000566565b6200059d602083018462000566565b9392505050565b600081519050919050565b600081905092915050565b60005b83811015620005da578082015181840152602081019050620005bd565b60008484015250505050565b6000620005f382620005a4565b620005ff8185620005af565b935062000611818560208601620005ba565b80840191505092915050565b60006200062b8284620005e6565b915081905092915050565b60008160030b9050919050565b6200064e8162000636565b81146200065a57600080fd5b50565b6000815190506200066e8162000643565b92915050565b6000602082840312156200068d576200068c620003c0565b5b60006200069d848285016200065d565b91505092915050565b6000819050919050565b620006bb81620006a6565b82525050565b6000606082019050620006d8600083018662000566565b620006e7602083018562000566565b620006f66040830184620006b0565b949350505050565b60805160a0516107fe620007306000396000818160f501526102a101526000818160d4015261027d01526107fe6000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c806312424e3f146100515780637c41ad2c1461005b57806382bfefc81461008b578063bc17c290146100a9575b600080fd5b6100596100c7565b005b61007560048036038101906100709190610559565b610166565b604051610082919061059f565b60405180910390f35b61009361027b565b6040516100a091906105c9565b60405180910390f35b6100b161029f565b6040516100be91906105c9565b60405180910390f35b6000600a9050600061011a7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000846103db565b9050601660030b8114610162576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161015990610641565b60405180910390fd5b5050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161019d91906105c9565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161020791906106d2565b6000604051808303816000865af19150503d8060008114610244576040519150601f19603f3d011682016040523d82523d6000602084013e610249565b606091505b50915091508161025a57601561026f565b8080602001905181019061026e9190610722565b5b60030b92505050919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b7f000000000000000000000000000000000000000000000000000000000000000081565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b86866040516024016102fc92919061074f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161036691906106d2565b6000604051808303816000865af19150503d80600081146103a3576040519150601f19603f3d011682016040523d82523d6000602084013e6103a8565b606091505b5091509150816103b95760156103ce565b808060200190518101906103cd9190610722565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b87878760405160240161041693929190610791565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161048091906106d2565b6000604051808303816000865af19150503d80600081146104bd576040519150601f19603f3d011682016040523d82523d6000602084013e6104c2565b606091505b5091509150816104d35760156104e8565b808060200190518101906104e79190610722565b5b60030b925050509392505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610526826104fb565b9050919050565b6105368161051b565b811461054157600080fd5b50565b6000813590506105538161052d565b92915050565b60006020828403121561056f5761056e6104f6565b5b600061057d84828501610544565b91505092915050565b6000819050919050565b61059981610586565b82525050565b60006020820190506105b46000830184610590565b92915050565b6105c38161051b565b82525050565b60006020820190506105de60008301846105ba565b92915050565b600082825260208201905092915050565b7f417070726f76616c206661696c65640000000000000000000000000000000000600082015250565b600061062b600f836105e4565b9150610636826105f5565b602082019050919050565b6000602082019050818103600083015261065a8161061e565b9050919050565b600081519050919050565b600081905092915050565b60005b8381101561069557808201518184015260208101905061067a565b60008484015250505050565b60006106ac82610661565b6106b6818561066c565b93506106c6818560208601610677565b80840191505092915050565b60006106de82846106a1565b915081905092915050565b60008160030b9050919050565b6106ff816106e9565b811461070a57600080fd5b50565b60008151905061071c816106f6565b92915050565b600060208284031215610738576107376104f6565b5b60006107468482850161070d565b91505092915050565b600060408201905061076460008301856105ba565b61077160208301846105ba565b9392505050565b6000819050919050565b61078b81610778565b82525050565b60006060820190506107a660008301866105ba565b6107b360208301856105ba565b6107c06040830184610782565b94935050505056fea26469706673582212202bf0b9ad9e9c03d66d615290b76e66b6572517b0e113bdf1f8fe4f70c991434664736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.json
deleted file mode 100644
index 343538234ef1..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"address","name":"spender","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"SPENDER","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"TOKEN","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"approve","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"token","type":"address"}],"name":"pauseToken","outputs":[{"internalType":"int256","name":"responseCode","type":"int256"}],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.bin
deleted file mode 100644
index 6eb458f63439..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-6080604052604051610bf3380380610bf38339818101604052810190610025919061010c565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061014c565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a382610078565b9050919050565b6100b381610098565b81146100be57600080fd5b50565b6000815190506100d0816100aa565b92915050565b6000819050919050565b6100e9816100d6565b81146100f457600080fd5b50565b600081519050610106816100e0565b92915050565b6000806040838503121561012357610122610073565b5b6000610131858286016100c1565b9250506020610142858286016100f7565b9150509250929050565b610a988061015b6000396000f3fe60806040526004361061009c5760003560e01c80637d3d1c2f116100645780637d3d1c2f146101345780638da5cb5b1461015d57806393925015146101885780639a2d8d5c146101c5578063c2985578146101f5578063d5bd5e49146102205761009c565b806304187951146100a157806312065fe0146100ab5780635e0ff908146100d657806370a08231146100e0578063737bc3c91461011d575b600080fd5b6100a961025d565b005b3480156100b757600080fd5b506100c06103e4565b6040516100cd9190610789565b60405180910390f35b6100de6103ec565b005b3480156100ec57600080fd5b5061010760048036038101906101029190610807565b610575565b6040516101149190610789565b60405180910390f35b34801561012957600080fd5b50610132610596565b005b34801561014057600080fd5b5061015b60048036038101906101569190610872565b6105cf565b005b34801561016957600080fd5b506101726105e8565b60405161017f91906108ae565b60405180910390f35b34801561019457600080fd5b506101af60048036038101906101aa9190610807565b61060c565b6040516101bc91906108e4565b60405180910390f35b6101df60048036038101906101da9190610807565b61067f565b6040516101ec91906108e4565b60405180910390f35b34801561020157600080fd5b5061020a6106f5565b6040516102179190610789565b60405180910390f35b34801561022c57600080fd5b5061024760048036038101906102429190610807565b6106fb565b60405161025491906108e4565b60405180910390f35b60007f6861736800000000000000000000000000000000000000000000000000000000905060006001905060007f7200000000000000000000000000000000000000000000000000000000000000905060007f730000000000000000000000000000000000000000000000000000000000000090506000600173ffffffffffffffffffffffffffffffffffffffff16858585856040516024016103039493929190610934565b6040516020818303038152906040527f96d107f6000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161038d91906109ea565b6000604051808303816000865af19150503d80600081146103ca576040519150601f19603f3d011682016040523d82523d6000602084013e6103cf565b606091505b50509050806103dd57600080fd5b5050505050565b600047905090565b60007f6861736800000000000000000000000000000000000000000000000000000000905060006001905060007f7200000000000000000000000000000000000000000000000000000000000000905060007f730000000000000000000000000000000000000000000000000000000000000090506000600173ffffffffffffffffffffffffffffffffffffffff166001868686866040516024016104949493929190610934565b6040516020818303038152906040527f96d107f6000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161051e91906109ea565b60006040518083038185875af1925050503d806000811461055b576040519150601f19603f3d011682016040523d82523d6000602084013e610560565b606091505b505090508061056e57600080fd5b5050505050565b60008173ffffffffffffffffffffffffffffffffffffffff16319050919050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8073ffffffffffffffffffffffffffffffffffffffff16ff5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000808273ffffffffffffffffffffffffffffffffffffffff1660405161063290610a4d565b600060405180830381855af49150503d806000811461066d576040519150601f19603f3d011682016040523d82523d6000602084013e610672565b606091505b5050905080915050919050565b6000808273ffffffffffffffffffffffffffffffffffffffff16346040516106a690610a4d565b60006040518083038185875af1925050503d80600081146106e3576040519150601f19603f3d011682016040523d82523d6000602084013e6106e8565b606091505b5050905080915050919050565b60015481565b6000808273ffffffffffffffffffffffffffffffffffffffff1660405161072190610a4d565b6000604051808303816000865af19150503d806000811461075e576040519150601f19603f3d011682016040523d82523d6000602084013e610763565b606091505b5050905080915050919050565b6000819050919050565b61078381610770565b82525050565b600060208201905061079e600083018461077a565b92915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006107d4826107a9565b9050919050565b6107e4816107c9565b81146107ef57600080fd5b50565b600081359050610801816107db565b92915050565b60006020828403121561081d5761081c6107a4565b5b600061082b848285016107f2565b91505092915050565b600061083f826107a9565b9050919050565b61084f81610834565b811461085a57600080fd5b50565b60008135905061086c81610846565b92915050565b600060208284031215610888576108876107a4565b5b60006108968482850161085d565b91505092915050565b6108a8816107c9565b82525050565b60006020820190506108c3600083018461089f565b92915050565b60008115159050919050565b6108de816108c9565b82525050565b60006020820190506108f960008301846108d5565b92915050565b6000819050919050565b610912816108ff565b82525050565b600060ff82169050919050565b61092e81610918565b82525050565b60006080820190506109496000830187610909565b6109566020830186610925565b6109636040830185610909565b6109706060830184610909565b95945050505050565b600081519050919050565b600081905092915050565b60005b838110156109ad578082015181840152602081019050610992565b60008484015250505050565b60006109c482610979565b6109ce8185610984565b93506109de81856020860161098f565b80840191505092915050565b60006109f682846109b9565b915081905092915050565b7f626f6f2875696e74323536290000000000000000000000000000000000000000600082015250565b6000610a37600c83610984565b9150610a4282610a01565b600c82019050919050565b6000610a5882610a2a565b915081905091905056fea2646970667358221220e5e09f2c074af04e5a14ba0900e0e88018680dd7470bc268886eacb07fc3ed9c64736f6c63430008130033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.json
deleted file mode 100644
index a331be92fb34..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.json
+++ /dev/null
@@ -1,167 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_foo",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_add",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_toCall",
-        "type": "address"
-      }
-    ],
-    "name": "callSpecific",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_toCall",
-        "type": "address"
-      }
-    ],
-    "name": "callSpecificWithValue",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_toCall",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCallSpecific",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "foo",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getBalance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "lowLevelECREC",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "lowLevelECRECWithValue",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "selfDestructWithBeneficiary",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "vacateAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.bin
deleted file mode 100644
index 31ac1047f785..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x60c06040526009608090815268746f6b656e4e616d6560b81b60a0526002906200002a90826200026c565b5060408051808201909152600b81526a1d1bdad95b94de5b589bdb60aa1b60208201526003906200005c90826200026c565b50604080518082019091526004808252636d656d6f60e01b6020830152906200008690826200026c565b50600580546001600160a81b0319167008000000000000271000000000000003e8179055348015620000b757600080fd5b50600160208181527fa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb499190915560027fcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f5560047fd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f5560087f7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b5560107fedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643557fe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c55600660005260407f8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a5562000338565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620001f057607f821691505b6020821081036200021157634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000267576000816000526020600020601f850160051c81016020861015620002425750805b601f850160051c820191505b8181101562000263578281556001016200024e565b5050505b505050565b81516001600160401b03811115620002885762000288620001c5565b620002a081620002998454620001db565b8462000217565b602080601f831160018114620002d85760008415620002bf5750858301515b600019600386901b1c1916600185901b17855562000263565b600085815260208120601f198616915b828110156200030957888601518255948401946001909101908401620002e8565b5085821015620003285787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b613f6b80620003486000396000f3fe6080604052600436106101145760003560e01c80638ba74da0116100a0578063d85f74c111610064578063d85f74c1146102db578063de84a779146102ee578063e9f732261461030e578063f4a01e5b14610321578063f848fec41461034157600080fd5b80638ba74da0146102575780638f74a17b1461026a5780639b23d3d914610295578063b35d417a146102b5578063cc265af4146102c857600080fd5b806336348de3116100e757806336348de3146101b45780634b5c6687146101d45780634d1769d6146101e7578063618dc65e1461021657806371de37071461024457600080fd5b80630488c939146101195780630fd2601e1461012e578063118741e71461016657806315dacbea14610194575b600080fd5b61012c610127366004612f56565b610361565b005b34801561013a57600080fd5b5061014e610149366004612f56565b6108d4565b60405160079190910b81526020015b60405180910390f35b34801561017257600080fd5b5061018661018136600461306a565b610931565b60405190815260200161015d565b3480156101a057600080fd5b5061014e6101af36600461311e565b610985565b3480156101c057600080fd5b506101866101cf3660046133e4565b610a79565b61012c6101e236600461352c565b610a85565b3480156101f357600080fd5b50610207610202366004613549565b610e8d565b60405161015d93929190613660565b34801561022257600080fd5b5061023661023136600461368b565b610f4e565b60405161015d92919061372b565b61012c61025236600461374c565b61106c565b61012c610265366004612f56565b6111d1565b61027d61027836600461368b565b61163d565b6040516001600160a01b03909116815260200161015d565b3480156102a157600080fd5b5061014e6102b036600461311e565b6119ff565b61012c6102c336600461368b565b611a44565b61012c6102d636600461368b565b611e15565b61012c6102e936600461352c565b611eec565b3480156102fa57600080fd5b50610207610309366004613549565b612287565b61027d61031c36600461368b565b612321565b34801561032d57600080fd5b5061018661033c366004612f56565b6123fb565b34801561034d57600080fd5b5061018661035c3660046137b0565b612407565b60408051600580825260c08201909252600091816020015b610381612ed1565b8152602001906001900390816103795790505090506103b460006006600060405180602001604052806000815250612463565b816000815181106103c7576103c76137f1565b60200260200101819052506103ee600160006040518060200160405280600081525061249a565b81600181518110610401576104016137f1565b6020026020010181905250610428600260006040518060200160405280600081525061249a565b8160028151811061043b5761043b6137f1565b6020026020010181905250610462600460006040518060200160405280600081525061249a565b81600381518110610475576104756137f1565b602002602001018190525061049c600360006040518060200160405280600081525061249a565b816004815181106104af576104af6137f1565b602002602001018190525060006040518060600160405280600060070b8152602001856001600160a01b03168152602001627a120060070b815250905060006040518061012001604052806002805461050790613807565b80601f016020809104026020016040519081016040528092919081815260200182805461053390613807565b80156105805780601f1061055557610100808354040283529160200191610580565b820191906000526020600020905b81548152906001019060200180831161056357829003601f168201915b505050505081526020016003805461059790613807565b80601f01602080910402602001604051908101604052809291908181526020018280546105c390613807565b80156106105780601f106105e557610100808354040283529160200191610610565b820191906000526020600020905b8154815290600101906020018083116105f357829003601f168201915b50505050508152602001866001600160a01b031681526020016004805461063690613807565b80601f016020809104026020016040519081016040528092919081815260200182805461066290613807565b80156106af5780601f10610684576101008083540402835291602001916106af565b820191906000526020600020905b81548152906001019060200180831161069257829003601f168201915b5050509183525050600160208201819052600554600160401b810460070b6040840152600160a01b900460ff16151560608301526080820186905260a090910184905290915060009060405190808252806020026020018201604052801561075157816020015b6040805160a0810182526000808252602080830182905292820181905260608201819052608082015282526000199092019101816107165790505b506040805160a081018252600181526001600160a01b0380891660208301526000928201839052606082018390528916608082015282519293509183919061079b5761079b6137f1565b6020908102919091010152604080516001808252818301909252600091816020015b6040805160c08101825260008082526020808301829052928201819052606082018190526080820181905260a082015282526000199092019101816107bd5790505090506040518060c00160405280600460070b8152602001600560070b8152602001600a60070b8152602001876001600160a01b03168152602001600015158152602001886001600160a01b031681525081600081518110610862576108626137f1565b602002602001018190525060008061087b8585856124cf565b90925090506016821461088d57600080fd5b6040516001600160a01b03821681527f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed9060200160405180910390a1505050505050505050565b60006108e083836125f7565b604051600782900b81529091507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa9060200160405180910390a1600781900b60161461092b57600080fd5b92915050565b600061093d83836126da565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8160405161097091815260200190565b60405180910390a16016811461092b57600080fd5b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610a049190613841565b6000604051808303816000865af19150503d8060008114610a41576040519150601f19603f3d011682016040523d82523d6000602084013e610a46565b606091505b509150915081610a57576015610a6b565b80806020019051810190610a6b919061386f565b60030b979650505050505050565b600061093d8383612706565b60408051600580825260c08201909252600091816020015b610aa5612ed1565b815260200190600190039081610a9d579050509050610ad860006006600060405180602001604052806000815250612463565b81600081518110610aeb57610aeb6137f1565b6020026020010181905250610b12600160006040518060200160405280600081525061249a565b81600181518110610b2557610b256137f1565b6020026020010181905250610b4c600260006040518060200160405280600081525061249a565b81600281518110610b5f57610b5f6137f1565b6020026020010181905250610b86600360006040518060200160405280600081525061249a565b81600381518110610b9957610b996137f1565b6020026020010181905250610bc0600460006040518060200160405280600081525061249a565b81600481518110610bd357610bd36137f1565b602002602001018190525060006040518060600160405280600060070b8152602001846001600160a01b03168152602001627a120060070b8152509050600060405180610120016040528060028054610c2b90613807565b80601f0160208091040260200160405190810160405280929190818152602001828054610c5790613807565b8015610ca45780601f10610c7957610100808354040283529160200191610ca4565b820191906000526020600020905b815481529060010190602001808311610c8757829003601f168201915b5050505050815260200160038054610cbb90613807565b80601f0160208091040260200160405190810160405280929190818152602001828054610ce790613807565b8015610d345780601f10610d0957610100808354040283529160200191610d34565b820191906000526020600020905b815481529060010190602001808311610d1757829003601f168201915b50505050508152602001856001600160a01b0316815260200160048054610d5a90613807565b80601f0160208091040260200160405190810160405280929190818152602001828054610d8690613807565b8015610dd35780601f10610da857610100808354040283529160200191610dd3565b820191906000526020600020905b815481529060010190602001808311610db657829003601f168201915b505050918352505060016020820152600554600160401b8104600790810b604084015260ff600160a01b830416151560608401526080830187905260a09092018590529192506000918291610e3791859181900b90600160801b900460030b612732565b909250905060168214610e4957600080fd5b6040516001600160a01b03821681527f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed9060200160405180910390a1505050505050565b6000806060610e9d86868661279f565b60405183815292955090935091507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa9060200160405180910390a160168314610ee557600080fd5b7ffc6b20023c4bac8ff1c48c1693e0cea5cd3c2163e9c2da41c58f17dd6d9f163d8282604051610f1692919061388a565b60405180910390a1610f4486303384600081518110610f3757610f376137f1565b602002602001015161289d565b5093509350939050565b600060606000806101676001600160a01b031663618dc65e60e01b8787604051602401610f7c9291906138a6565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051610fba9190613841565b6000604051808303816000865af19150503d8060008114610ff7576040519150601f19603f3d011682016040523d82523d6000602084013e610ffc565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516110329291906138c8565b60405180910390a1816110565760156040518060200160405280600081525061105a565b6016815b60039190910b97909650945050505050565b604051638f74a17b60e01b81526000903090638f74a17b90349061109690889088906004016138a6565b60206040518083038185885af11580156110b4573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906110d991906138e3565b60405163f4a01e5b60e01b81523360048201526001600160a01b0382166024820152909150309063f4a01e5b906044016020604051808303816000875af1158015611128573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061114c9190613900565b506040516307e9300f60e11b81526001600160a01b03821660048201523360248201523090630fd2601e906044016020604051808303816000875af1158015611199573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111bd9190613919565b506111ca813033856128e5565b5050505050565b604080516001808252818301909252600091816020015b6111f0612ed1565b8152602001906001900390816111e8579050509050611222600080600060405180602001604052806000815250612463565b81600081518110611235576112356137f1565b602002602001018190525060006040518060600160405280600060070b8152602001856001600160a01b03168152602001627a120060070b815250905060006040518061012001604052806002805461128d90613807565b80601f01602080910402602001604051908101604052809291908181526020018280546112b990613807565b80156113065780601f106112db57610100808354040283529160200191611306565b820191906000526020600020905b8154815290600101906020018083116112e957829003601f168201915b505050505081526020016003805461131d90613807565b80601f016020809104026020016040519081016040528092919081815260200182805461134990613807565b80156113965780601f1061136b57610100808354040283529160200191611396565b820191906000526020600020905b81548152906001019060200180831161137957829003601f168201915b50505050508152602001866001600160a01b03168152602001600480546113bc90613807565b80601f01602080910402602001604051908101604052809291908181526020018280546113e890613807565b80156114355780601f1061140a57610100808354040283529160200191611435565b820191906000526020600020905b81548152906001019060200180831161141857829003601f168201915b5050509183525050600160208201819052600554600160401b900460070b6040808401919091526000606084018190526080840188905260a09093018690528051828152808201909152929350909190816020015b6040805160a08101825260008082526020808301829052928201819052606082018190526080820152825260001990920191018161148a5750506040805160a081018252600181526001600160a01b0388811660208301526000928201839052606082018390528916608082015282519293509183919061150d5761150d6137f1565b6020908102919091010152604080516001808252818301909252600091816020015b6040805160c08101825260008082526020808301829052928201819052606082018190526080820181905260a0820152825260001990920191018161152f5750506040805160c0810182526004815260056020820152600a91810191909152601e60608201526000608082018190526001600160a01b038a1660a0830152825192935090918391906115c3576115c36137f1565b602090810291909101015260055460009081906115f3908690600781900b90600160801b900460030b878761292d565b915091507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8260405161162891815260200190565b60405180910390a16016821461088d57600080fd5b60408051600580825260c08201909252600091829190816020015b611660612ed1565b81526020019060019003908161165857905050905061168460006006600386612463565b81600081518110611697576116976137f1565b60200260200101819052506116af600160038561249a565b816001815181106116c2576116c26137f1565b60200260200101819052506116da600260038561249a565b816002815181106116ed576116ed6137f1565b6020026020010181905250611705600460038561249a565b81600381518110611718576117186137f1565b602002602001018190525061172f6003808561249a565b81600481518110611742576117426137f1565b602002602001018190525060006040518060600160405280600060070b8152602001866001600160a01b03168152602001627a120060070b815250905060006040518061012001604052806002805461179a90613807565b80601f01602080910402602001604051908101604052809291908181526020018280546117c690613807565b80156118135780601f106117e857610100808354040283529160200191611813565b820191906000526020600020905b8154815290600101906020018083116117f657829003601f168201915b505050505081526020016003805461182a90613807565b80601f016020809104026020016040519081016040528092919081815260200182805461185690613807565b80156118a35780601f10611878576101008083540402835291602001916118a3565b820191906000526020600020905b81548152906001019060200180831161188657829003601f168201915b50505050508152602001876001600160a01b03168152602001600480546118c990613807565b80601f01602080910402602001604051908101604052809291908181526020018280546118f590613807565b80156119425780601f1061191757610100808354040283529160200191611942565b820191906000526020600020905b81548152906001019060200180831161192557829003601f168201915b505050918352505060016020820152600554600160401b8104600790810b604084015260ff600160a01b830416151560608401526080830187905260a090920185905291925060009182916119a691859181900b90600160801b900460030b612732565b9092509050601682146119b857600080fd5b6040516001600160a01b03821681527f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed9060200160405180910390a1979650505050505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a4016109c6565b60408051600680825260e08201909252600091816020015b611a64612ed1565b815260200190600190039081611a5c579050509050611a8860006006600385612463565b81600081518110611a9b57611a9b6137f1565b6020026020010181905250611ab3600160038461249a565b81600181518110611ac657611ac66137f1565b6020026020010181905250611ade600260038461249a565b81600281518110611af157611af16137f1565b6020026020010181905250611b09600460038461249a565b81600381518110611b1c57611b1c6137f1565b6020026020010181905250611b336003808461249a565b81600481518110611b4657611b466137f1565b6020026020010181905250611b5e6000600130612a5b565b81600581518110611b7157611b716137f1565b602002602001018190525060006040518060600160405280600060070b8152602001856001600160a01b03168152602001627a120060070b8152509050600060405180610120016040528060028054611bc990613807565b80601f0160208091040260200160405190810160405280929190818152602001828054611bf590613807565b8015611c425780601f10611c1757610100808354040283529160200191611c42565b820191906000526020600020905b815481529060010190602001808311611c2557829003601f168201915b5050505050815260200160038054611c5990613807565b80601f0160208091040260200160405190810160405280929190818152602001828054611c8590613807565b8015611cd25780601f10611ca757610100808354040283529160200191611cd2565b820191906000526020600020905b815481529060010190602001808311611cb557829003601f168201915b50505050508152602001866001600160a01b0316815260200160048054611cf890613807565b80601f0160208091040260200160405190810160405280929190818152602001828054611d2490613807565b8015611d715780601f10611d4657610100808354040283529160200191611d71565b820191906000526020600020905b815481529060010190602001808311611d5457829003601f168201915b505050918352505060016020820152600554600160401b810460070b6040830152600160a01b900460ff16151560608201526080810185905260a0018390529050600080611dbe83612a86565b909250905060168214611dd057600080fd5b6040516001600160a01b03821681527f7bb17726df1f3adee8aa00ba8e8bc5d6f182af3bbf77604639cb7f008dd3b4ed9060200160405180910390a150505050505050565b60408051600480825260a08201909252600091816020015b611e35612ed1565b815260200190600190039081611e2d579050509050611e5960006006600385612463565b81600081518110611e6c57611e6c6137f1565b6020026020010181905250611e84600260038461249a565b81600181518110611e9757611e976137f1565b6020026020010181905250611eaf600460038461249a565b81600281518110611ec257611ec26137f1565b6020026020010181905250611ed96003808461249a565b81600381518110611b7157611b716137f1565b60408051600580825260c08201909252600091816020015b611f0c612ed1565b815260200190600190039081611f04579050509050611f3f60006006600060405180602001604052806000815250612463565b81600081518110611f5257611f526137f1565b6020026020010181905250611f79600160006040518060200160405280600081525061249a565b81600181518110611f8c57611f8c6137f1565b6020026020010181905250611fb3600260006040518060200160405280600081525061249a565b81600281518110611fc657611fc66137f1565b6020026020010181905250611fed600460006040518060200160405280600081525061249a565b81600381518110612000576120006137f1565b6020026020010181905250612027600360006040518060200160405280600081525061249a565b8160048151811061203a5761203a6137f1565b602002602001018190525060006040518060600160405280600060070b8152602001846001600160a01b03168152602001627a120060070b815250905060006040518061012001604052806002805461209290613807565b80601f01602080910402602001604051908101604052809291908181526020018280546120be90613807565b801561210b5780601f106120e05761010080835404028352916020019161210b565b820191906000526020600020905b8154815290600101906020018083116120ee57829003601f168201915b505050505081526020016003805461212290613807565b80601f016020809104026020016040519081016040528092919081815260200182805461214e90613807565b801561219b5780601f106121705761010080835404028352916020019161219b565b820191906000526020600020905b81548152906001019060200180831161217e57829003601f168201915b50505050508152602001856001600160a01b03168152602001600480546121c190613807565b80601f01602080910402602001604051908101604052809291908181526020018280546121ed90613807565b801561223a5780601f1061220f5761010080835404028352916020019161223a565b820191906000526020600020905b81548152906001019060200180831161221d57829003601f168201915b505050918352505060016020820152600554600160401b810460070b6040830152600160a01b900460ff16151560608201526080810185905260a0018390529050600080610e3783612a86565b600080606061229786868661279f565b60405183815292955090935091507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa9060200160405180910390a1601683146122df57600080fd5b7ffc6b20023c4bac8ff1c48c1693e0cea5cd3c2163e9c2da41c58f17dd6d9f163d828260405161231092919061388a565b60405180910390a193509350939050565b60408051600480825260a08201909252600091829190816020015b612344612ed1565b81526020019060019003908161233c57905050905061236860006006600386612463565b8160008151811061237b5761237b6137f1565b6020026020010181905250612393600260038561249a565b816001815181106123a6576123a66137f1565b60200260200101819052506123be600460038561249a565b816002815181106123d1576123d16137f1565b60200260200101819052506123e86003808561249a565b81600381518110611742576117426137f1565b600061093d8383612b96565b6000612414848484612bcc565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8160405161244791815260200190565b60405180910390a16016811461245c57600080fd5b9392505050565b61246b612ed1565b60405180604001604052806124808787612ca5565b815260200161248f8585612ce0565b905295945050505050565b6124a2612ed1565b60405180604001604052806124b686612df1565b81526020016124c58585612ce0565b9052949350505050565b600080848061010001516000015160070b60001480156124f957506101008101516040015160070b155b1561250f576101008101516276a7006040909101525b6000806101676001600160a01b03163463abb54eb560e01b8a8a8a60405160240161253c93929190613b6d565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161257a9190613841565b60006040518083038185875af1925050503d80600081146125b7576040519150601f19603f3d011682016040523d82523d6000602084013e6125bc565b606091505b5091509150816125cf57601560006125e3565b808060200190518101906125e39190613c26565b60039190910b999098509650505050505050565b6040516001600160a01b038381166024830152821660448201526000908190819061016790638f8d7f9960e01b906064015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516126679190613841565b6000604051808303816000865af19150503d80600081146126a4576040519150601f19603f3d011682016040523d82523d6000602084013e6126a9565b606091505b5091509150816126ba5760156126ce565b808060200190518101906126ce919061386f565b60030b95945050505050565b60008060006101676001600160a01b0316632e63879b60e01b8686604051602401612629929190613c52565b60008060006101676001600160a01b0316637d305cfa60e01b8686604051602401612629929190613caf565b600080848061010001516000015160070b600014801561275c57506101008101516040015160070b155b15612772576101008101516276a7006040909101525b6000806101676001600160a01b031634630fb65bf360e01b8a8a8a60405160240161253c93929190613cd1565b60008060606000806101676001600160a01b031663e0f4059a60e01b8989896040516024016127d093929190613d00565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161280e9190613841565b6000604051808303816000865af19150503d806000811461284b576040519150601f19603f3d011682016040523d82523d6000602084013e612850565b606091505b509150915081612873576040805160008082526020820190925260159190612887565b808060200190518101906128879190613d7f565b60039290920b9a90995090975095505050505050565b6040516001600160a01b038581166024830152848116604483015283166064820152600782900b60848201526000908190819061016790635cfc901160e01b9060a4016109c6565b6040516001600160a01b038581166024830152848116604483015283166064820152600782900b6084820152600090819081906101679063eca3691760e01b9060a4016109c6565b600080868061010001516000015160070b600014801561295757506101008101516040015160070b155b1561296d576101008101516276a7006040909101525b6000806101676001600160a01b031634632af0c59a60e01b8c8c8c8c8c60405160240161299e959493929190613e3f565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516129dc9190613841565b60006040518083038185875af1925050503d8060008114612a19576040519150601f19603f3d011682016040523d82523d6000602084013e612a1e565b606091505b509150915081612a315760156000612a45565b80806020019051810190612a459190613c26565b60039190910b9b909a5098505050505050505050565b612a63612ed1565b6040518060400160405280612a7786612df1565b81526020016124c58585612e30565b600080828061010001516000015160070b6000148015612ab057506101008101516040015160070b155b15612ac6576101008101516276a7006040909101525b6000806101676001600160a01b03163463ea83f29360e01b88604051602401612aef9190613f0c565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051612b2d9190613841565b60006040518083038185875af1925050503d8060008114612b6a576040519150601f19603f3d011682016040523d82523d6000602084013e612b6f565b606091505b509150915081612b82576015600061105a565b8080602001905181019061105a9190613c26565b6040516001600160a01b03838116602483015282166044820152600090819081906101679063248a35ef60e11b90606401612629565b604080516001600160a01b03858116602483015284166044820152606480820184905282518083039091018152608490910182526020810180516001600160e01b031663e1f21c6760e01b17905290516000918291829161016791612c319190613841565b6000604051808303816000865af19150503d8060008114612c6e576040519150601f19603f3d011682016040523d82523d6000602084013e612c73565b606091505b509150915081612c84576015612c98565b80806020019051810190612c98919061386f565b60030b9695505050505050565b6000612cc9836006811115612cbc57612cbc613f1f565b600160ff9091161b821790565b905061245c826006811115612cbc57612cbc613f1f565b612d266040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6000836004811115612d3a57612d3a613f1f565b03612d48576001815261092b565b6001836004811115612d5c57612d5c613f1f565b03612d77576000546001600160a01b0316602082015261092b565b6002836004811115612d8b57612d8b613f1f565b03612d9c576040810182905261092b565b6003836004811115612db057612db0613f1f565b03612dc1576060810182905261092b565b6004836004811115612dd557612dd5613f1f565b0361092b576000546001600160a01b0316608082015292915050565b600060016000836006811115612e0957612e09613f1f565b6006811115612e1a57612e1a613f1f565b8152602001908152602001600020549050919050565b612e766040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6001836004811115612e8a57612e8a613f1f565b03612ea3576001600160a01b038216602082015261092b565b6004836004811115612eb757612eb7613f1f565b0361092b576001600160a01b038216608082015292915050565b604051806040016040528060008152602001612f296040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b905290565b6001600160a01b0381168114612f4357600080fd5b50565b8035612f5181612f2e565b919050565b60008060408385031215612f6957600080fd5b8235612f7481612f2e565b91506020830135612f8481612f2e565b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715612fc857612fc8612f8f565b60405290565b60405160a0810167ffffffffffffffff81118282101715612fc857612fc8612f8f565b604051610120810167ffffffffffffffff81118282101715612fc857612fc8612f8f565b604051601f8201601f1916810167ffffffffffffffff8111828210171561303e5761303e612f8f565b604052919050565b600067ffffffffffffffff82111561306057613060612f8f565b5060051b60200190565b6000806040838503121561307d57600080fd5b823561308881612f2e565b915060208381013567ffffffffffffffff8111156130a557600080fd5b8401601f810186136130b657600080fd5b80356130c96130c482613046565b613015565b81815260059190911b820183019083810190888311156130e857600080fd5b928401925b8284101561310f57833561310081612f2e565b825292840192908401906130ed565b80955050505050509250929050565b6000806000806080858703121561313457600080fd5b843561313f81612f2e565b9350602085013561314f81612f2e565b9250604085013561315f81612f2e565b9396929550929360600135925050565b600082601f83011261318057600080fd5b813567ffffffffffffffff81111561319a5761319a612f8f565b6131ad601f8201601f1916602001613015565b8181528460208386010111156131c257600080fd5b816020850160208301376000918101602001919091529392505050565b80358015158114612f5157600080fd5b8060070b8114612f4357600080fd5b8035612f51816131ef565b600082601f83011261321a57600080fd5b8135602061322a6130c483613046565b82815260059290921b8401810191818101908684111561324957600080fd5b8286015b8481101561336357803567ffffffffffffffff8082111561326d57600080fd5b908801906040601f19838c03810182131561328757600080fd5b61328f612fa5565b88850135815282850135848111156132a657600080fd5b949094019360a0858e03830112156132be5760008081fd5b6132c6612fce565b91506132d38986016131df565b8252828501356132e281612f2e565b828a0152606085810135858111156132fa5760008081fd5b6133088f8c838a010161316f565b85850152506080935083860135858111156133235760008081fd5b6133318f8c838a010161316f565b82850152505060a0850135945061334785612f2e565b918101939093528087019290925250835291830191830161324d565b509695505050505050565b60006060828403121561338057600080fd5b6040516060810181811067ffffffffffffffff821117156133a3576133a3612f8f565b60405290508082356133b4816131ef565b815260208301356133c481612f2e565b602082015260408301356133d7816131ef565b6040919091015292915050565b600080604083850312156133f757600080fd5b823561340281612f2e565b9150602083013567ffffffffffffffff8082111561341f57600080fd5b90840190610160828703121561343457600080fd5b61343c612ff1565b82358281111561344b57600080fd5b6134578882860161316f565b82525060208301358281111561346c57600080fd5b6134788882860161316f565b60208301525061348a60408401612f46565b60408201526060830135828111156134a157600080fd5b6134ad8882860161316f565b6060830152506134bf608084016131df565b60808201526134d060a084016131fe565b60a08201526134e160c084016131df565b60c082015260e0830135828111156134f857600080fd5b61350488828601613209565b60e083015250610100915061351b8783850161336e565b828201528093505050509250929050565b60006020828403121561353e57600080fd5b813561245c81612f2e565b60008060006060848603121561355e57600080fd5b833561356981612f2e565b925060208481013561357a816131ef565b9250604085013567ffffffffffffffff8082111561359757600080fd5b818701915087601f8301126135ab57600080fd5b81356135b96130c482613046565b81815260059190911b8301840190848101908a8311156135d857600080fd5b8585015b83811015613610578035858111156135f45760008081fd5b6136028d89838a010161316f565b8452509186019186016135dc565b508096505050505050509250925092565b60008151808452602080850194506020840160005b8381101561365557815160070b87529582019590820190600101613636565b509495945050505050565b8381528260070b60208201526060604082015260006136826060830184613621565b95945050505050565b6000806040838503121561369e57600080fd5b82356136a981612f2e565b9150602083013567ffffffffffffffff8111156136c557600080fd5b6136d18582860161316f565b9150509250929050565b60005b838110156136f65781810151838201526020016136de565b50506000910152565b600081518084526137178160208601602086016136db565b601f01601f19169290920160200192915050565b82815260406020820152600061374460408301846136ff565b949350505050565b60008060006060848603121561376157600080fd5b833561376c81612f2e565b9250602084013567ffffffffffffffff81111561378857600080fd5b6137948682870161316f565b92505060408401356137a5816131ef565b809150509250925092565b6000806000606084860312156137c557600080fd5b83356137d081612f2e565b925060208401356137e081612f2e565b929592945050506040919091013590565b634e487b7160e01b600052603260045260246000fd5b600181811c9082168061381b57607f821691505b60208210810361383b57634e487b7160e01b600052602260045260246000fd5b50919050565b600082516138538184602087016136db565b9190910192915050565b8051600381900b8114612f5157600080fd5b60006020828403121561388157600080fd5b61245c8261385d565b8260070b81526040602082015260006137446040830184613621565b6001600160a01b038316815260406020820152600061374460408301846136ff565b821515815260406020820152600061374460408301846136ff565b6000602082840312156138f557600080fd5b815161245c81612f2e565b60006020828403121561391257600080fd5b5051919050565b60006020828403121561392b57600080fd5b815161245c816131ef565b600082825180855260208086019550808260051b84010181860160005b848110156139f057601f198684030189528151604081518552858201519150808686015281511515818601528582015160606001600160a01b038083168289015283850151935060a09250608083818a01526139b260e08a01866136ff565b92860151898403603f1901858b01529294506139ce85846136ff565b9501511660c09790970196909652505098840198925090830190600101613953565b5090979650505050505050565b60006101608251818552613a13828601826136ff565b91505060208301518482036020860152613a2d82826136ff565b9150506040830151613a4a60408601826001600160a01b03169052565b5060608301518482036060860152613a6282826136ff565b9150506080830151613a78608086018215159052565b5060a0830151613a8d60a086018260070b9052565b5060c0830151613aa160c086018215159052565b5060e083015184820360e0860152613ab98282613936565b91505061010080840151613af582870182805160070b82526001600160a01b036020820151166020830152604081015160070b60408301525050565b5090949350505050565b60008151808452602080850194506020840160005b83811015613655578151805160070b8852838101516001600160a01b03908116858a01526040808301511515908a01526060808301511515908a0152608091820151169088015260a09096019590820190600101613b14565b60006060808352613b8160608401876139fd565b602084820381860152613b948288613aff565b9150604085830360408701528287518085528385019150838901945060005b81811015613c165785518051600790810b855286820151810b8786015285820151900b85850152878101516001600160a01b039081168986015260808083015115159086015260a09182015116908401529484019460c090920191600101613bb3565b50909a9950505050505050505050565b60008060408385031215613c3957600080fd5b613c428361385d565b91506020830151612f8481612f2e565b6000604082016001600160a01b03808616845260206040602086015282865180855260608701915060208801945060005b81811015613ca1578551851683529483019491830191600101613c83565b509098975050505050505050565b6001600160a01b038316815260406020820152600061374460408301846139fd565b606081526000613ce460608301866139fd565b90508360070b60208301528260030b6040830152949350505050565b6000606082016001600160a01b038616835260208560070b60208501526060604085015281855180845260808601915060808160051b87010193506020870160005b82811015613d7057607f19888703018452613d5e8683516136ff565b95509284019290840190600101613d42565b50939998505050505050505050565b600080600060608486031215613d9457600080fd5b613d9d8461385d565b9250602080850151613dae816131ef565b604086015190935067ffffffffffffffff811115613dcb57600080fd5b8501601f81018713613ddc57600080fd5b8051613dea6130c482613046565b81815260059190911b82018301908381019089831115613e0957600080fd5b928401925b82841015613e30578351613e21816131ef565b82529284019290840190613e0e565b80955050505050509250925092565b600060a0808352613e5360a08401896139fd565b602060078960070b8287015260408960030b604088015260608785036060890152613e7e858b613aff565b9450608088860360808a0152858a518088528688019150868c01975060005b81811015613ef75788518051880b845288810151880b8985015286810151880b8785015285810151880b86850152848101511515858501528a01516001600160a01b03168a8401529787019760c090920191600101613e9d565b50909f9e505050505050505050505050505050565b60208152600061245c60208301846139fd565b634e487b7160e01b600052602160045260246000fdfea264697066735822122086358a260252798c8ac40863c5ad0f37d3e9a55cf4ce9fb75f70d11b779b7b0a64736f6c63430008170033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.json
deleted file mode 100644
index 846eb5c704a6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.json
+++ /dev/null
@@ -1,651 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "CreatedToken",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "name": "KycGranted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "int64",
-        "name": "newTotalSupply",
-        "type": "int64"
-      },
-      {
-        "indexed": false,
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "MintedToken",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "name": "ResponseCode",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "approvePublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "associateTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "tokens",
-        "type": "address[]"
-      }
-    ],
-    "name": "associateTokensPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "createFungibleTokenPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeTokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "createFungibleTokenWithCustomFeesPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "adminKey",
-        "type": "bytes"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "createFungibleTokenWithSECP256K1AdminKeyAssociateAndTransferToAddressPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "adminKey",
-        "type": "bytes"
-      }
-    ],
-    "name": "createFungibleTokenWithSECP256K1AdminKeyPublic",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "adminKey",
-        "type": "bytes"
-      }
-    ],
-    "name": "createFungibleTokenWithSECP256K1AdminKeyWithoutKYCPublic",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "createNonFungibleTokenPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeTokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "createNonFungibleTokenWithCustomFeesPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "adminKey",
-        "type": "bytes"
-      }
-    ],
-    "name": "createNonFungibleTokenWithSECP256K1AdminKeyPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "adminKey",
-        "type": "bytes"
-      }
-    ],
-    "name": "createNonFungibleTokenWithSECP256K1AdminKeyWithoutKYCPublic",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKycPublic",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "int64",
-        "name": "newTotalSupply",
-        "type": "int64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      },
-      {
-        "internalType": "bytes[]",
-        "name": "metadata",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "mintTokenToAddressPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "int64",
-        "name": "newTotalSupply",
-        "type": "int64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "response",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "string",
-            "name": "name",
-            "type": "string"
-          },
-          {
-            "internalType": "string",
-            "name": "symbol",
-            "type": "string"
-          },
-          {
-            "internalType": "address",
-            "name": "treasury",
-            "type": "address"
-          },
-          {
-            "internalType": "string",
-            "name": "memo",
-            "type": "string"
-          },
-          {
-            "internalType": "bool",
-            "name": "tokenSupplyType",
-            "type": "bool"
-          },
-          {
-            "internalType": "int64",
-            "name": "maxSupply",
-            "type": "int64"
-          },
-          {
-            "internalType": "bool",
-            "name": "freezeDefault",
-            "type": "bool"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint256",
-                "name": "keyType",
-                "type": "uint256"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "bool",
-                    "name": "inheritAccountKey",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "contractId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bytes",
-                    "name": "ed25519",
-                    "type": "bytes"
-                  },
-                  {
-                    "internalType": "bytes",
-                    "name": "ECDSA_secp256k1",
-                    "type": "bytes"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "delegatableContractId",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.KeyValue",
-                "name": "key",
-                "type": "tuple"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.TokenKey[]",
-            "name": "tokenKeys",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "int64",
-                "name": "second",
-                "type": "int64"
-              },
-              {
-                "internalType": "address",
-                "name": "autoRenewAccount",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "autoRenewPeriod",
-                "type": "int64"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.Expiry",
-            "name": "expiry",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.HederaToken",
-        "name": "tokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenInfoPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.bin
deleted file mode 100644
index ae6f0c86e641..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061016d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063016aa20b1461003b578063eeb4914e14610057575b600080fd5b610055600480360381019061005091906100ca565b610073565b005b610071600480360381019061006c919061010a565b610085565b005b81600081905550806001819055505050565b8060028190555050565b600080fd5b6000819050919050565b6100a781610094565b81146100b257600080fd5b50565b6000813590506100c48161009e565b92915050565b600080604083850312156100e1576100e061008f565b5b60006100ef858286016100b5565b9250506020610100858286016100b5565b9150509250929050565b6000602082840312156101205761011f61008f565b5b600061012e848285016100b5565b9150509291505056fea26469706673582212201ad071e41ce71c1c341d70104e939ce34aa6c9636345dea0e97db1333af13c0064736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.json
deleted file mode 100644
index 33a00a1d5b1c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"uint256","name":"_a","type":"uint256"},{"internalType":"uint256","name":"_b","type":"uint256"}],"name":"setAB","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_c","type":"uint256"}],"name":"setC","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.bin
deleted file mode 100644
index 4b1a6b61785c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610782806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063d71020671461003b578063f429f19b1461006b575b600080fd5b61005560048036038101906100509190610408565b61009b565b604051610062919061058b565b60405180910390f35b61008560048036038101906100809190610408565b610100565b60405161009291906105a6565b60405180910390f35b60008060006100a984610168565b915060070b9150601660030b82146100f6576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016100ed906105e1565b60405180910390fd5b8092505050919050565b600080600061010e84610289565b60030b915060070b9150601660030b821461015e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610155906105c1565b60405180910390fd5b8092505050919050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff166319f3736160e01b866040516024016101a09190610570565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161020a9190610559565b6000604051808303816000865af19150503d8060008114610247576040519150601f19603f3d011682016040523d82523d6000602084013e61024c565b606091505b50915091508161025f5760156000610274565b808060200190518101906102739190610435565b5b8160030b915080945081955050505050915091565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff166393272baf60e01b866040516024016102c19190610570565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161032b9190610559565b6000604051808303816000865af19150503d8060008114610368576040519150601f19603f3d011682016040523d82523d6000602084013e61036d565b606091505b50915091508161039f5760157fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6103b4565b808060200190518101906103b39190610475565b5b8160030b915080945081955050505050915091565b6000813590506103d881610707565b92915050565b6000815190506103ed8161071e565b92915050565b60008151905061040281610735565b92915050565b60006020828403121561041e5761041d6106b0565b5b600061042c848285016103c9565b91505092915050565b6000806040838503121561044c5761044b6106b0565b5b600061045a858286016103f3565b925050602061046b858286016103de565b9150509250929050565b6000806040838503121561048c5761048b6106b0565b5b600061049a858286016103f3565b92505060206104ab858286016103f3565b9150509250929050565b6104be81610628565b82525050565b6104cd8161063a565b82525050565b60006104de82610601565b6104e8818561060c565b93506104f881856020860161067d565b80840191505092915050565b61050d81610646565b82525050565b6000610520601c83610617565b915061052b826106b5565b602082019050919050565b6000610543601383610617565b915061054e826106de565b602082019050919050565b600061056582846104d3565b915081905092915050565b600060208201905061058560008301846104b5565b92915050565b60006020820190506105a060008301846104c4565b92915050565b60006020820190506105bb6000830184610504565b92915050565b600060208201905081810360008301526105da81610513565b9050919050565b600060208201905081810360008301526105fa81610536565b9050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b60006106338261065d565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b8381101561069b578082015181840152602081019050610680565b838111156106aa576000848401525b50505050565b600080fd5b7f546f6b656e20747970652061707072616973616c206661696c65642100000000600082015250565b7f546f6b656e20636865636b206661696c65642100000000000000000000000000600082015250565b61071081610628565b811461071b57600080fd5b50565b6107278161063a565b811461073257600080fd5b50565b61073e81610650565b811461074957600080fd5b5056fea2646970667358221220207525b79b7ec4eb192f0f05dd1149b232d8b429bacb90d60688428f502de58864736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.json
deleted file mode 100644
index eac433933440..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.json
+++ /dev/null
@@ -1,356 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getTokenKey",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "key",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getType",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "isAToken",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint256",
-            "name": "keyType",
-            "type": "uint256"
-          },
-          {
-            "components": [
-              {
-                "internalType": "bool",
-                "name": "inheritAccountKey",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "contractId",
-                "type": "address"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ed25519",
-                "type": "bytes"
-              },
-              {
-                "internalType": "bytes",
-                "name": "ECDSA_secp256k1",
-                "type": "bytes"
-              },
-              {
-                "internalType": "address",
-                "name": "delegatableContractId",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.KeyValue",
-            "name": "key",
-            "type": "tuple"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenKey[]",
-        "name": "keys",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "updateTokenKeys",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.bin
deleted file mode 100644
index af0deae85a23..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-60c06040526009608081905268746f6b656e4e616d6560b81b60a09081526200002c9160019190620000ae565b5060408051808201909152600b8082526a1d1bdad95b94de5b589bdb60aa1b60209092019182526200006191600291620000ae565b50604080518082019091526004808252636d656d6f60e01b60209092019182526200008f91600391620000ae565b5060c86004556008600555348015620000a757600080fd5b5062000191565b828054620000bc9062000154565b90600052602060002090601f016020900481019282620000e057600085556200012b565b82601f10620000fb57805160ff19168380011785556200012b565b828001600101855582156200012b579182015b828111156200012b5782518255916020019190600101906200010e565b50620001399291506200013d565b5090565b5b808211156200013957600081556001016200013e565b600181811c908216806200016957607f821691505b602082108114156200018b57634e487b7160e01b600052602260045260246000fd5b50919050565b61442d80620001a16000396000f3fe6080604052600436106101ee5760003560e01c80636f58b9d91161010d578063bafcaf7a116100a0578063d57448aa1161006f578063d57448aa146104ba578063d6fa40ae146104da578063e7b07cb6146104ed578063fc8df2da1461050d578063fe7386e11461052257600080fd5b8063bafcaf7a14610452578063c5ce9ea714610472578063c72e97f414610492578063d2324db0146104a757600080fd5b806390ef79c2116100dc57806390ef79c2146103ea5780639d560cb4146103f2578063ab8d30fd14610412578063b914bb791461043257600080fd5b80636f58b9d9146103a757806377ed4ab2146103af578063801ecdbf146103c25780638e93bc33146103ca57600080fd5b80631fdc817e1161018557806339c4052c1161015457806339c4052c14610334578063475337ad1461035457806355167f0e146103675780635be2a0261461038757600080fd5b80631fdc817e146102db57806324553206146102ee5780632f3e0c1214610301578063377a329f1461031457600080fd5b806312b89946116101c157806312b8994614610268578063150a9ff5146102885780631c984505146102a85780631fa6a696146102bb57600080fd5b8063091cc899146101f357806311684f53146102225780631191a272146102425780631295123c14610255575b600080fd5b610206610201366004613526565b610537565b6040516001600160a01b03909116815260200160405180910390f35b34801561022e57600080fd5b5061020661023d3660046135ab565b610607565b6102066102503660046135e2565b610632565b6102066102633660046136b5565b6107e7565b34801561027457600080fd5b506102066102833660046136ea565b61085f565b34801561029457600080fd5b506102066102a3366004613731565b6109d5565b6102066102b63660046136b5565b6109f5565b3480156102c757600080fd5b506102066102d6366004613799565b610ab5565b6102066102e93660046136b5565b610ada565b6102066102fc366004613817565b610b63565b61020661030f36600461385f565b610ea1565b34801561032057600080fd5b5061020661032f3660046138f5565b610fac565b34801561034057600080fd5b5061020661034f366004613731565b610fcb565b610206610362366004613963565b610fe5565b34801561037357600080fd5b506102066103823660046139d5565b611028565b34801561039357600080fd5b506102066103a2366004613a2d565b611043565b61020661105b565b6102066103bd366004613a5b565b61106d565b6102066111cb565b3480156103d657600080fd5b506102066103e5366004613ab4565b61131b565b61020661132b565b3480156103fe57600080fd5b5061020661040d366004613b11565b611344565b34801561041e57600080fd5b5061020661042d366004613b5e565b611353565b34801561043e57600080fd5b5061020661044d366004613bda565b611381565b34801561045e57600080fd5b5061020661046d3660046135ab565b61139a565b34801561047e57600080fd5b5061020661048d366004613c19565b6113b1565b34801561049e57600080fd5b506102066113ce565b6102066104b536600461385f565b6113e0565b3480156104c657600080fd5b506102066104d5366004613731565b6114ea565b6102066104e83660046136ea565b611502565b3480156104f957600080fd5b506102066105083660046135ab565b6117a9565b34801561051957600080fd5b506102066117c0565b34801561052e57600080fd5b506102066117d2565b604080516001808252818301909252600091829190816020015b6105596132f3565b81526020019060019003908161055157905050905061057b60006004896117f3565b8160008151811061058e5761058e613c75565b602002602001018190525060006105a9306000878786611828565b905060006105b96001888a611a35565b905060006105d060046005600a601e60018e611b10565b90506000806105e6856004546005548787611b80565b9092509050601682146105f857600080fd5b9b9a5050505050505050505050565b600061062b610614611cb4565b61061e8585611d7a565b610626611de2565b611e1b565b9392505050565b60408051600580825260c08201909252600091829190816020015b6106556132f3565b81526020019060019003908161064d5790505090506106796000600160038c611f68565b8160008151811061068c5761068c613c75565b60200260200101819052506106a66002600360048b611f68565b816001815181106106b9576106b9613c75565b60200260200101819052506106d16004600289611f9f565b816002815181106106e4576106e4613c75565b60200260200101819052506106fb60058088611f9f565b8160038151811061070e5761070e613c75565b602002602001018190525061073560066001604051806020016040528060008152506117f3565b8160048151811061074857610748613c75565b602002602001018190525060006107638b6000888886611828565b905060008061077783600454600554611fca565b90925090506016821461078957600080fd5b61079386826120f8565b9150601682146107a257600080fd5b6040805160008082526020820190925281906107c29084906064906121cc565b9092509050601682146107d457600080fd5b50909d9c50505050505050505050505050565b60408051600280825260608201909252600091829190816020015b61080a6132f3565b815260200190600190039081610802579050509050600061082f306000878786611828565b905060008061084383600454600554611fca565b90925090506016821461085557600080fd5b9695505050505050565b604080516001808252818301909252600091829190816020015b6108816132f3565b8152602001906001900390816108795790505090506108b260006001604051806020016040528060008152506117f3565b816000815181106108c5576108c5613c75565b602002602001018190525060006108e0866000878786611828565b90506000806101676001600160a01b0316637812a04b60e01b8460045460055460405160240161091293929190613eae565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516109509190613ed3565b600060405180830381855af49150503d806000811461098b576040519150601f19603f3d011682016040523d82523d6000602084013e610990565b606091505b50915091508161099f57600080fd5b600080828060200190518101906109b69190613eef565b9092509050601682146109c857600080fd5b9998505050505050505050565b60006109ed6109e2611cb4565b61061e8686866122b5565b949350505050565b604080516001808252818301909252600091829190816020015b610a176132f3565b815260200190600190039081610a0f579050509050610a346132f3565b60048152610a40613312565b30602080830191909152600182528201819052825182908490600090610a6857610a68613c75565b60200260200101819052506000610a83306000898988611828565b9050600080610a9783600454600554611fca565b909250905060168214610aa957600080fd5b98975050505050505050565b60006109c8610ac2611cb4565b610acd8b8a8761231f565b6106268b8a8a8a896123d4565b600080610b243082868682604051908082528060200260200182016040528015610b1e57816020015b610b0b6132f3565b815260200190600190039081610b035790505b50611828565b9050610b49604080516060810182526000808252602082018190529181019190915290565b603781526101008201819052600080610843848280611fca565b60408051600380825260808201909252600091829190816020015b610b866132f3565b815260200190600190039081610b7e579050509050610ba860006003876117f3565b81600081518110610bbb57610bbb613c75565b6020026020010181905250610bd36004600230611f9f565b81600181518110610be657610be6613c75565b6020026020010181905250610bfe6006600230611f9f565b81600281518110610c1157610c11613c75565b60200260200101819052506000610c2c306000878786611828565b9050600080610c3e83601e6008611fca565b909250905060168214610c5057600080fd5b8094506000816001600160a01b03166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa158015610c93573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610cbb9190810190613f14565b90506001604051610ccc9190613fbc565b6040518091039020818051906020012014610d245760405162461bcd60e51b815260206004820152601360248201527213985b59481a5cc81b9bdd0818dbdc9c9958dd606a1b60448201526064015b60405180910390fd5b6000826001600160a01b03166318160ddd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d889190614058565b905080601e14610dda5760405162461bcd60e51b815260206004820152601b60248201527f546f74616c20737570706c79206973206e6f7420636f727265637400000000006044820152606401610d1b565b60405163a9059cbb60e01b81526001600160a01b038a81166004830152601460248301526000919085169063a9059cbb906044016020604051808303816000875af1158015610e2d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e519190614071565b905080610e935760405162461bcd60e51b815260206004820152601060248201526f5472616e73666572206661696c65642160801b6044820152606401610d1b565b505050505050509392505050565b60408051600280825260608201909252600091829190816020015b610ec46132f3565b815260200190600190039081610ebc579050509050610ee6600060028a611f9f565b81600081518110610ef957610ef9613c75565b6020026020010181905250610f1160046003856117f3565b81600181518110610f2457610f24613c75565b60200260200101819052506000610f3f886000888886611828565b6001608082015261019060a082015290506000610f6260046005838b818e61248d565b90506000806105e68482604051908082528060200260200182016040528015610fa557816020015b610f92613355565b815260200190600190039081610f8a5790505b50856124d1565b6000610fc2610fbd86868686612544565b6125c5565b95945050505050565b60006109ed610fd8611cb4565b61061e868686600061271c565b600080610ff36003866127c0565b90506000611005876000878786611828565b600160808201819052600a60a083015260c08201529050600080610a978361283d565b6000610fc2611035611cb4565b606061062688888888612965565b60006109ed611050611cb4565b61061e8587866129d1565b6000611068610fbd611cb4565b905090565b604080516001808252818301909252600091829190816020015b61108f6132f3565b8152602001906001900390816110875790505090506110b160006004886117f3565b816000815181106110c4576110c4613c75565b602002602001018190525060006110df306000878786611828565b905060006110ee600188612a12565b60408051600180825281830190925291925060009190816020015b611111613355565b815260200190600190039081611109579050509050818160008151811061113a5761113a613c75565b60200260200101819052506000806111ab856004546005548660006001600160401b0381111561116c5761116c613432565b6040519080825280602002602001820160405280156111a557816020015b611192613383565b81526020019060019003908161118a5790505b50611b80565b9092509050601682146111bd57600080fd5b9a9950505050505050505050565b60006111d56133b8565b600180546111e290613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461120e90613f81565b801561125b5780601f106112305761010080835404028352916020019161125b565b820191906000526020600020905b81548152906001019060200180831161123e57829003601f168201915b50505091835250506002805461127090613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461129c90613f81565b80156112e95780601f106112be576101008083540402835291602001916112e9565b820191906000526020600020905b8154815290600101906020018083116112cc57829003601f168201915b505050505060208201523060408201526000806113098360c86008611fca565b90925090506016821461062b57600080fd5b60006109ed610fbd858585612a43565b60006113356133b8565b60008061130983600080611fca565b600061062b610fbd84846127c0565b6000611376611360611cb4565b61136a8986612ac2565b61062689898988612965565b979650505050505050565b6000610fc261138e611cb4565b61061e8787878761271c565b600061062b6113a7611cb4565b61061e8585612b02565b60006113766113be611cb4565b60606106268a8a8a8a8a8a611b10565b60006110686113db611cb4565b612b42565b60408051600280825260608201909252600091829190816020015b6114036132f3565b8152602001906001900390816113fb579050509050611425600060028a611f9f565b8160008151811061143857611438613c75565b602002602001018190525061145060046003856117f3565b8160018151811061146357611463613c75565b6020026020010181905250600061147e886000888886611828565b6001608082015261019060a0820152905060006114a160046005600a8b8d612c94565b90506000806105e68482604051908082528060200260200182016040528015610fa557816020015b6114d1613355565b8152602001906001900390816114c957905050856124d1565b60006109ed6114f7611cb4565b61061e868686611a35565b60408051600280825260608201909252600091829190816020015b6115256132f3565b81526020019060019003908161151d5790505090506115476000600287611f9f565b8160008151811061155a5761155a613c75565b60200260200101819052506115726004600287611f9f565b8160018151811061158557611585613c75565b602002602001018190525060006115a0306000878786611828565b905060006115b16004600589612d68565b90506000806115fa8482604051908082528060200260200182016040528015610fa557816020015b6115e1613355565b8152602001906001900390816115d957905050856124d1565b90925090506016821461160c57600080fd5b8095506000816001600160a01b03166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa15801561164f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526116779190810190613f14565b905060016040516116889190613fbc565b60405180910390208180519060200120146116db5760405162461bcd60e51b815260206004820152601360248201527213985b59481a5cc81b9bdd0818dbdc9c9958dd606a1b6044820152606401610d1b565b6000826001600160a01b03166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa15801561171b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526117439190810190613f14565b905060026040516117549190613fbc565b6040518091039020818051906020012014610e935760405162461bcd60e51b815260206004820152601560248201527414de5b589bdb081a5cc81b9bdd0818dbdc9c9958dd605a1b6044820152606401610d1b565b600061062b6117b6611cb4565b61061e8585612ac2565b60006110686117cd611cb4565b612da9565b6000611068610fbd6004600160405180602001604052806000815250612a43565b6117fb6132f3565b604051806040016040528061180f86612fce565b815260200161181e8585613060565b9052949350505050565b6118306133b8565b6040805160608101825263ffffffff87811682526001600160a01b03871660208301528516918101919091526001805461186990613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461189590613f81565b80156118e25780601f106118b7576101008083540402835291602001916118e2565b820191906000526020600020905b8154815290600101906020018083116118c557829003601f168201915b5050509184525050600280546118f790613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461192390613f81565b80156119705780601f1061194557610100808354040283529160200191611970565b820191906000526020600020905b81548152906001019060200180831161195357829003601f168201915b505050505060208301526001600160a01b038716604083015260e082018390526101008201819052600380546119a590613f81565b80601f01602080910402602001604051908101604052809291908181526020018280546119d190613f81565b8015611a1e5780601f106119f357610100808354040283529160200191611a1e565b820191906000526020600020905b815481529060010190602001808311611a0157829003601f168201915b505050505082606001819052505095945050505050565b60408051600380825260808201909252606091816020015b611a55613355565b815260200190600190039081611a4d5790505090506000611a778585856130f3565b90506000611a8f611a898760026140a4565b8561311e565b90506000611aa7611aa18860046140a4565b86613148565b90508284600081518110611abd57611abd613c75565b60200260200101819052508184600181518110611adc57611adc613c75565b60200260200101819052508084600281518110611afb57611afb613c75565b60200260200101819052505050509392505050565b604080516001808252818301909252606091816020015b611b2f613383565b815260200190600190039081611b275790505090506000611b54888888888888613172565b90508082600081518110611b6a57611b6a613c75565b6020026020010181905250509695505050505050565b600080868061010001516000015163ffffffff166000148015611bb057506101008101516040015163ffffffff16155b15611bc6576101008101516276a7006040909101525b6000806101676001600160a01b031634634c381ae760e01b8c8c8c8c8c604051602401611bf795949392919061414b565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051611c359190613ed3565b60006040518083038185875af1925050503d8060008114611c72576040519150601f19603f3d011682016040523d82523d6000602084013e611c77565b606091505b509150915081611c8a5760156000611c9e565b80806020019051810190611c9e9190614222565b60039190910b9b909a5098505050505050505050565b6040805160028082526060828101909352816020015b611cd26132f3565b815260200190600190039081611cca579050509050611d02600180604051806020016040528060008152506117f3565b81600081518110611d1557611d15613c75565b60200260200101819052506040518060400160405280611d37600460066131b6565b8152602001611d56600260405180602001604052806000815250613060565b81525081600181518110611d6c57611d6c613c75565b602002602001018190525090565b604080516001808252818301909252606091816020015b611d99613355565b815260200190600190039081611d915790505090506000611dba8484613148565b90508082600081518110611dd057611dd0613c75565b60200260200101819052505092915050565b60408051600080825260208201909252606091611e15565b611e02613383565b815260200190600190039081611dfa5790505b50905090565b6000611e256133b8565b60018054611e3290613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054611e5e90613f81565b8015611eab5780601f10611e8057610100808354040283529160200191611eab565b820191906000526020600020905b815481529060010190602001808311611e8e57829003601f168201915b505050918352505060028054611ec090613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054611eec90613f81565b8015611f395780601f10611f0e57610100808354040283529160200191611f39565b820191906000526020600020905b815481529060010190602001808311611f1c57829003601f168201915b5050505050602082015230604082015260e0810185905260045460055460009182916108439185918989611b80565b611f706132f3565b6040518060400160405280611f8587876131b6565b8152602001611f948585613060565b905295945050505050565b611fa76132f3565b6040518060400160405280611fbb86612fce565b815260200161181e85856131cf565b600080848061010001516000015163ffffffff166000148015611ffa57506101008101516040015163ffffffff16155b15612010576101008101516276a7006040909101525b6000806101676001600160a01b031634637812a04b60e01b8a8a8a60405160240161203d93929190613eae565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161207b9190613ed3565b60006040518083038185875af1925050503d80600081146120b8576040519150601f19603f3d011682016040523d82523d6000602084013e6120bd565b606091505b5091509150816120d057601560006120e4565b808060200190518101906120e49190614222565b60039190910b999098509650505050505050565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b031663248a35ef60e11b179052905160009182918291610167916121599190613ed3565b6000604051808303816000865af19150503d8060008114612196576040519150601f19603f3d011682016040523d82523d6000602084013e61219b565b606091505b5091509150816121ac5760156121c0565b808060200190518101906121c0919061424e565b60030b95945050505050565b6000806000806101676001600160a01b031663acb9cff960e01b8888886040516024016121fb93929190614269565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516122399190613ed3565b6000604051808303816000865af19150503d8060008114612276576040519150601f19603f3d011682016040523d82523d6000602084013e61227b565b606091505b50915091508161228e57601560006122a2565b808060200190518101906122a291906142d3565b60039190910b9890975095505050505050565b604080516001808252818301909252606091816020015b6122d4613355565b8152602001906001900390816122cc57905050905060006122f68585856130f3565b9050808260008151811061230c5761230c613c75565b6020026020010181905250509392505050565b60608360ff166001600160401b0381111561233c5761233c613432565b60405190808252806020026020018201604052801561237557816020015b612362613355565b81526020019060019003908161235a5790505b50905060005b8460ff168160ff1610156123cc576000612395858561311e565b905080838360ff16815181106123ad576123ad613c75565b60200260200101819052505080806123c49061430b565b91505061237b565b509392505050565b60608560ff166001600160401b038111156123f1576123f1613432565b60405190808252806020026020018201604052801561242a57816020015b612417613383565b81526020019060019003908161240f5790505b50905060005b8660ff168160ff16101561248357600061244c87878787613218565b905080838360ff168151811061246457612464613c75565b602002602001018190525050808061247b9061430b565b915050612430565b5095945050505050565b604080516001808252818301909252606091816020015b6124ac613383565b8152602001906001900390816124a45790505090506000611b5488888888888861324d565b600080848061010001516000015163ffffffff16600014801561250157506101008101516040015163ffffffff16155b15612517576101008101516276a7006040909101525b6000806101676001600160a01b031634635bc7c0e660e01b8a8a8a60405160240161203d9392919061432b565b604080516001808252818301909252606091816020015b6125636132f3565b81526020019060019003908161255b579050509050604051806040016040528061258d87876131b6565b815260200161259c8585613060565b815250816000815181106125b2576125b2613c75565b6020026020010181905250949350505050565b60006125cf6133b8565b600180546125dc90613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461260890613f81565b80156126555780601f1061262a57610100808354040283529160200191612655565b820191906000526020600020905b81548152906001019060200180831161263857829003601f168201915b50505091835250506002805461266a90613f81565b80601f016020809104026020016040519081016040528092919081815260200182805461269690613f81565b80156126e35780601f106126b8576101008083540402835291602001916126e3565b820191906000526020600020905b8154815290600101906020018083116126c657829003601f168201915b5050505050602082015230604082015260e0810183905260008061270a8360c86008611fca565b9092509050601682146109ed57600080fd5b604080516001808252818301909252606091816020015b61273b613355565b815260200190600190039081612733579050509050600061275d8686866130f3565b9050600061277661276f8860026140a4565b87866130f3565b9050818360008151811061278c5761278c613c75565b602002602001018190525080836000815181106127ab576127ab613c75565b60200260200101819052505050949350505050565b604080516001808252818301909252606091816020015b6127df6132f3565b8152602001906001900390816127d75790505090506040518060400160405280612807607f90565b81526020016128168585613060565b8152508160008151811061282c5761282c613c75565b602002602001018190525092915050565b600080828061010001516000015163ffffffff16600014801561286d57506101008101516040015163ffffffff16155b15612883576101008101516276a7006040909101525b6000806101676001600160a01b031634639dc711e060e01b886040516024016128ac91906143e4565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516128ea9190613ed3565b60006040518083038185875af1925050503d8060008114612927576040519150601f19603f3d011682016040523d82523d6000602084013e61292c565b606091505b50915091508161293f5760156000612953565b808060200190518101906129539190614222565b60039190910b97909650945050505050565b604080516001808252818301909252606091816020015b612984613383565b81526020019060019003908161297c57905050905060006129a786868686613218565b905080826000815181106129bd576129bd613c75565b602002602001018190525050949350505050565b604080516001808252818301909252606091816020015b6129f0613355565b8152602001906001900390816129e857905050905060006122f6858585613293565b612a1a613355565b63ffffffff909216825260016040830181905260608301526001600160a01b0316608082015290565b604080516001808252818301909252606091816020015b612a626132f3565b815260200190600190039081612a5a5790505090506040518060400160405280612a8b86612fce565b8152602001612a9a8585613060565b81525081600081518110612ab057612ab0613c75565b60200260200101819052509392505050565b604080516001808252818301909252606091816020015b612ae1613355565b815260200190600190039081612ad95790505090506000611dba848461311e565b604080516001808252818301909252606091816020015b612b21613355565b815260200190600190039081612b195790505090506000611dba8484612a12565b6000612b4c6133b8565b60018054612b5990613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054612b8590613f81565b8015612bd25780601f10612ba757610100808354040283529160200191612bd2565b820191906000526020600020905b815481529060010190602001808311612bb557829003601f168201915b505050918352505060028054612be790613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054612c1390613f81565b8015612c605780601f10612c3557610100808354040283529160200191612c60565b820191906000526020600020905b815481529060010190602001808311612c4357829003601f168201915b5050505050602082015230604082015260e08101839052600160c0820152600454600554600091829161270a918591611fca565b60408051600380825260808201909252606091816020015b612cb4613383565b815260200190600190039081612cac5790505090506000612cd68787856132c5565b90506000612cea888888600060018961324d565b90506000612cfd8989898960008a61324d565b90508284600081518110612d1357612d13613c75565b60200260200101819052508184600181518110612d3257612d32613c75565b60200260200101819052508084600281518110612d5157612d51613c75565b602002602001018190525050505095945050505050565b604080516001808252818301909252606091816020015b612d87613383565b815260200190600190039081612d7f57905050905060006122f68585856132c5565b6000612db36133b8565b60018054612dc090613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054612dec90613f81565b8015612e395780601f10612e0e57610100808354040283529160200191612e39565b820191906000526020600020905b815481529060010190602001808311612e1c57829003601f168201915b505050918352505060028054612e4e90613f81565b80601f0160208091040260200160405190810160405280929190818152602001828054612e7a90613f81565b8015612ec75780601f10612e9c57610100808354040283529160200191612ec7565b820191906000526020600020905b815481529060010190602001808311612eaa57829003601f168201915b505050505060208201523060408083019190915260e082018490526004546005549151600092839261016792637812a04b60e01b92612f0d928892909190602401613eae565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b0319909416939093179092529051612f4b9190613ed3565b6000604051808303816000865af19150503d8060008114612f88576040519150601f19603f3d011682016040523d82523d6000602084013e612f8d565b606091505b509150915060008083612fa35760156000612fb7565b82806020019051810190612fb79190614222565b915060030b9150601660030b821461085557600080fd5b600060ff8216612fe057506001919050565b8160ff1660011415612ff457506002919050565b8160ff166002141561300857506004919050565b8160ff166003141561301c57506008919050565b8160ff166004141561303057506010919050565b8160ff166005141561304457506020919050565b8160ff166006141561305857506040919050565b506000919050565b613068613312565b8260ff166001141561307d57600181526130ed565b8260ff166002141561309f576000546001600160a01b031660208201526130ed565b8260ff16600314156130b757604081018290526130ed565b8260ff16600414156130cf57606081018290526130ed565b8260ff16600514156130ed576000546001600160a01b031660808201525b92915050565b6130fb613355565b63ffffffff90931683526001600160a01b03918216602084015216608082015290565b613126613355565b63ffffffff9092168252600160408301526001600160a01b0316608082015290565b613150613355565b63ffffffff9092168252600160608301526001600160a01b0316608082015290565b61317a613383565b63ffffffff9687168152948616602086015292851660408501529316606083015291151560808201526001600160a01b0390911660a082015290565b6000600160ff84161b9050600160ff83161b811761062b565b6131d7613312565b8260ff16600214156131f7576001600160a01b03821660208201526130ed565b8260ff16600514156130ed576001600160a01b038216608082015292915050565b613220613383565b63ffffffff9485168152929093166020830152151560808201526001600160a01b0390911660a082015290565b613255613383565b63ffffffff968716815294861660208601529290941660408401526001600160a01b039081166060840152921515608083015290911660a082015290565b61329b613355565b63ffffffff90931683526001600160a01b0391821660208401526001604084015216608082015290565b6132cd613383565b63ffffffff93841681529190921660208201526001600160a01b0390911660a082015290565b60405180604001604052806000815260200161330d613312565b905290565b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915290565b6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a081019190915290565b604051806101200160405280606081526020016060815260200160006001600160a01b0316815260200160608152602001600015158152602001600063ffffffff1681526020016000151581526020016060815260200161330d604080516060810182526000808252602082018190529181019190915290565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561347057613470613432565b604052919050565b60006001600160401b0382111561349157613491613432565b50601f01601f191660200190565b600082601f8301126134b057600080fd5b81356134c36134be82613478565b613448565b8181528460208386010111156134d857600080fd5b816020850160208301376000918101602001919091529392505050565b6001600160a01b038116811461350a57600080fd5b50565b803563ffffffff8116811461352157600080fd5b919050565b600080600080600060a0868803121561353e57600080fd5b85356001600160401b0381111561355457600080fd5b6135608882890161349f565b9550506020860135613571816134f5565b93506040860135613581816134f5565b92506060860135613591816134f5565b915061359f6080870161350d565b90509295509295909350565b600080604083850312156135be57600080fd5b6135c78361350d565b915060208301356135d7816134f5565b809150509250929050565b600080600080600080600080610100898b0312156135ff57600080fd5b883561360a816134f5565b975060208901356001600160401b038082111561362657600080fd5b6136328c838d0161349f565b985060408b013591508082111561364857600080fd5b506136558b828c0161349f565b9650506060890135613666816134f5565b94506080890135613676816134f5565b935060a0890135613686816134f5565b925061369460c08a0161350d565b915060e08901356136a4816134f5565b809150509295985092959890939650565b600080604083850312156136c857600080fd5b82356136d3816134f5565b91506136e16020840161350d565b90509250929050565b6000806000606084860312156136ff57600080fd5b833561370a816134f5565b9250602084013561371a816134f5565b91506137286040850161350d565b90509250925092565b60008060006060848603121561374657600080fd5b61374f8461350d565b9250602084013561375f816134f5565b9150604084013561376f816134f5565b809150509250925092565b803560ff8116811461352157600080fd5b801515811461350a57600080fd5b600080600080600080600080610100898b0312156137b657600080fd5b6137bf8961377a565b97506137cd60208a0161377a565b96506137db60408a0161350d565b95506137e960608a0161350d565b94506137f760808a0161350d565b935060a08901356138078161378b565b925060c0890135613694816134f5565b60008060006060848603121561382c57600080fd5b83356001600160401b0381111561384257600080fd5b61384e8682870161349f565b935050602084013561371a816134f5565b60008060008060008060c0878903121561387857600080fd5b8635613883816134f5565b95506020870135613893816134f5565b945060408701356138a3816134f5565b935060608701356138b3816134f5565b92506138c16080880161350d565b915060a08701356001600160401b038111156138dc57600080fd5b6138e889828a0161349f565b9150509295509295509295565b6000806000806080858703121561390b57600080fd5b6139148561377a565b93506139226020860161377a565b92506139306040860161377a565b915060608501356001600160401b0381111561394b57600080fd5b6139578782880161349f565b91505092959194509250565b6000806000806080858703121561397957600080fd5b8435613984816134f5565b935060208501356001600160401b0381111561399f57600080fd5b6139ab8782880161349f565b93505060408501356139bc816134f5565b91506139ca6060860161350d565b905092959194509250565b600080600080608085870312156139eb57600080fd5b6139f48561350d565b9350613a026020860161350d565b92506040850135613a128161378b565b91506060850135613a22816134f5565b939692955090935050565b600080600060608486031215613a4257600080fd5b8335613a4d816134f5565b925061375f6020850161350d565b60008060008060808587031215613a7157600080fd5b84356001600160401b03811115613a8757600080fd5b613a938782880161349f565b9450506020850135613aa4816134f5565b925060408501356139bc816134f5565b600080600060608486031215613ac957600080fd5b613ad28461377a565b9250613ae06020850161377a565b915060408401356001600160401b03811115613afb57600080fd5b613b078682870161349f565b9150509250925092565b60008060408385031215613b2457600080fd5b613b2d8361377a565b915060208301356001600160401b03811115613b4857600080fd5b613b548582860161349f565b9150509250929050565b60008060008060008060c08789031215613b7757600080fd5b613b808761350d565b9550613b8e6020880161350d565b9450613b9c6040880161350d565b93506060870135613bac8161378b565b92506080870135613bbc816134f5565b915060a0870135613bcc816134f5565b809150509295509295509295565b60008060008060808587031215613bf057600080fd5b613bf98561350d565b93506020850135613c09816134f5565b92506040850135613a12816134f5565b60008060008060008060c08789031215613c3257600080fd5b613c3b8761350d565b9550613c496020880161350d565b9450613c576040880161350d565b9350613c656060880161350d565b92506080870135613bbc8161378b565b634e487b7160e01b600052603260045260246000fd5b60005b83811015613ca6578181015183820152602001613c8e565b83811115613cb5576000848401525b50505050565b60008151808452613cd3816020860160208601613c8b565b601f01601f19169290920160200192915050565b600081518084526020808501808196508360051b8101915082860160005b85811015613d9e5782840389528151604081518652868201519150808787015281511515818701528682015160606001600160a01b03808316828a015283850151935060a09250608083818b0152613d6060e08b0186613cbb565b928601518a8403603f1901858c0152929450613d7c8584613cbb565b9501511660c09890980197909752505098850198935090840190600101613d05565b5091979650505050505050565b60006101608251818552613dc182860182613cbb565b91505060208301518482036020860152613ddb8282613cbb565b9150506040830151613df860408601826001600160a01b03169052565b5060608301518482036060860152613e108282613cbb565b9150506080830151613e26608086018215159052565b5060a0830151613e3e60a086018263ffffffff169052565b5060c0830151613e5260c086018215159052565b5060e083015184820360e0860152613e6a8282613ce7565b61010085810151805163ffffffff9081168984015260208201516001600160a01b03166101208a015260408201511661014089015291935091505090949350505050565b606081526000613ec16060830186613dab565b60208301949094525060400152919050565b60008251613ee5818460208701613c8b565b9190910192915050565b60008060408385031215613f0257600080fd5b8251915060208301516135d7816134f5565b600060208284031215613f2657600080fd5b81516001600160401b03811115613f3c57600080fd5b8201601f81018413613f4d57600080fd5b8051613f5b6134be82613478565b818152856020838501011115613f7057600080fd5b610fc2826020830160208601613c8b565b600181811c90821680613f9557607f821691505b60208210811415613fb657634e487b7160e01b600052602260045260246000fd5b50919050565b600080835481600182811c915080831680613fd857607f831692505b6020808410821415613ff857634e487b7160e01b86526022600452602486fd5b81801561400c576001811461401d5761404a565b60ff1986168952848901965061404a565b60008a81526020902060005b868110156140425781548b820152908501908301614029565b505084890196505b509498975050505050505050565b60006020828403121561406a57600080fd5b5051919050565b60006020828403121561408357600080fd5b815161062b8161378b565b634e487b7160e01b600052601160045260246000fd5b600063ffffffff808316818516818304811182151516156140c7576140c761408e565b02949350505050565b600081518084526020808501945080840160005b83811015614140578151805163ffffffff168852838101516001600160a01b03908116858a01526040808301511515908a01526060808301511515908a0152608091820151169088015260a090960195908201906001016140e4565b509495945050505050565b600060a080835261415e81840189613dab565b602088818601526040888187015260608684038188015261417f848a6140d0565b93506080878503818901528489518087528587019150858b01965060005b818110156141fc578751805163ffffffff90811685528882015181168986015287820151811688860152868201511686850152848101511515858501528901516001600160a01b0316898401529686019660c09092019160010161419d565b50909e9d5050505050505050505050505050565b8051600381900b811461352157600080fd5b6000806040838503121561423557600080fd5b61423e83614210565b915060208301516135d7816134f5565b60006020828403121561426057600080fd5b61062b82614210565b6000606082016001600160a01b038616835260206001600160401b0386168185015260606040850152818551808452608086019150828701935060005b818110156142c557845160070b835293830193918301916001016142a6565b509098975050505050505050565b600080604083850312156142e657600080fd5b6142ef83614210565b915060208301516001600160401b03811681146135d757600080fd5b600060ff821660ff8114156143225761432261408e565b60010192915050565b6000606080835261433e81840187613dab565b60208482038186015261435182886140d0565b91506040858303818701528287518085528385019150838901945060005b818110156143d4578551805163ffffffff908116855286820151811687860152858201511685850152878101516001600160a01b039081168986015260808083015115159086015260a09182015116908401529484019460c09092019160010161436f565b50909a9950505050505050505050565b60208152600061062b6020830184613dab56fea26469706673582212201808361e41e78bc15c1bd05d0ff773f2d48c583a9d068bfcedfdf6f4f4d84a5164736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.json
deleted file mode 100644
index 31495605f18c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.json
+++ /dev/null
@@ -1,973 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "createFrozenTokenWithDefaultKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createNFTTokenWithKeysAndExpiry",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "contractIdAndFeeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createNonFungibleTokenThenQuery",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "contractIdKey",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollectorAndTreasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "existingTokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      }
-    ],
-    "name": "createNonFungibleTokenWithCustomFees",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "contractIdKey",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollectorAndTreasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "existingTokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      }
-    ],
-    "name": "createNonFungibleTokenWithInvalidRoyaltyFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "ed25519AdminKey",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenThenQueryAndTransfer",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "ecdsaAdminKey",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "existingTokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenWithAllCustomFeesAvailable",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint8",
-        "name": "keyValueType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes",
-        "name": "key",
-        "type": "bytes"
-      }
-    ],
-    "name": "createTokenWithAllTypeKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithAllTypesFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithCorrectAndWrongTokenFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithCurrentTokenFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint8",
-        "name": "firstKeyType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint8",
-        "name": "secondKeyType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint8",
-        "name": "keyValueType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes",
-        "name": "key",
-        "type": "bytes"
-      }
-    ],
-    "name": "createTokenWithCustomDuplexTypeKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint8",
-        "name": "keyType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint8",
-        "name": "keyValueType",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes",
-        "name": "key",
-        "type": "bytes"
-      }
-    ],
-    "name": "createTokenWithCustomSingleTypeKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "createTokenWithDefaultExpiryAndEmptyKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "createTokenWithDefaultKeys",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "createTokenWithDefaultKeysViaDelegateCall",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenWithEmptyKeysArray",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "createTokenWithEmptyTokenStruct",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithFixedFeeForTokenAndHbars",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "numerator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "denominator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bool",
-        "name": "netOfTransfers",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithFractionalFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "numerator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "denominator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "minimumAmount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "maximumAmount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bool",
-        "name": "netOfTransfers",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithFractionalFeeWithLimits",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numerator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "denominator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bool",
-        "name": "netOfTransfers",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fractionalFeeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithHbarFixedFeeAndFractionalFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithHbarsFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "createTokenWithInheritedSupplyKey",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenWithInvalidExpiry",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "ecdsaAdminKey",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenWithInvalidFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithInvalidFlagsFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "createTokenWithKeyWithMultipleValues",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ecdsa",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "delegatableContractID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "toAssociateWith",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithKeysAndExpiry",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint8",
-        "name": "numberOfFixedFees",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint8",
-        "name": "numberOfFractionalFees",
-        "type": "uint8"
-      },
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "numerator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "denominator",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bool",
-        "name": "netOfTransfers",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "fixedFeeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "fractionalFeeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithNAmountHbarFixedFeesAndNAmountFractionalFees",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithTokenFixedFee",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "firstFeeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "secondFeeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithTokenFixedFees",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "delegateCallCreate",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.bin
deleted file mode 100644
index fb751f09fc7f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610559806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063319a87231461003b578063fd4d1c261461007f575b600080fd5b61007d6004803603602081101561005157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100c3565b005b6100c16004803603602081101561009557600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610134565b005b6000806100cf836101c2565b91509150601660030b821461012f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260238152602001806105016023913960400191505060405180910390fd5b505050565b60008061014083610361565b91509150601660030b82146101bd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f676574546f6b656e44656661756c744b7963537461747573206661696c65642181525060200191505060405180910390fd5b505050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663a7daa18d60e01b86604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106102a1578051825260208201915060208101905060208303925061027e565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610303576040519150601f19603f3d011682016040523d82523d6000602084013e610308565b606091505b50915091508161031b576015600061034c565b80806020019051604081101561033057600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b915080945081955050505050915091565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663335e04c160e01b86604051602401808273ffffffffffffffffffffffffffffffffffffffff168152602001915050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b60208310610440578051825260208201915060208101905060208303925061041d565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d80600081146104a2576040519150601f19603f3d011682016040523d82523d6000602084013e6104a7565b606091505b5091509150816104ba57601560006104eb565b8080602001905160408110156104cf57600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b91508094508195505050505091509156fe676574546f6b656e44656661756c74467265657a65537461747573206661696c656421a26469706673582212208d8d8b14870cfc4a61bd9175cc84ba08bf49c0a38e10e6255a760c2476de515064736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.json
deleted file mode 100644
index cd2ab601bba6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenDefaultFreeze",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenDefaultKyc",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.bin
deleted file mode 100644
index 3c061eaf99ea..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610bc1806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631de8edad1461005c5780633ab1998b1461008c5780633b3bff0f146100a85780637c41ad2c146100d8578063f0190d4914610108575b600080fd5b610076600480360381019061007191906107c3565b610138565b60405161008391906109e9565b60405180910390f35b6100a660048036038101906100a191906107f0565b61016a565b005b6100c260048036038101906100bd91906107c3565b610200565b6040516100cf91906109ce565b60405180910390f35b6100f260048036038101906100ed91906107c3565b610315565b6040516100ff91906109ce565b60405180910390f35b610122600480360381019061011d91906107f0565b61042a565b60405161012f91906109e9565b60405180910390f35b6101406106b3565b60008061014c8461046b565b91509150601660030b821461016057600080fd5b8092505050919050565b6101726106b3565b83816000019063ffffffff16908163ffffffff168152505082816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505081816040019063ffffffff16908163ffffffff168152505060006101e6868361059b565b9050601660030b81146101f857600080fd5b505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b85604051602401610237919061098a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102a19190610973565b6000604051808303816000865af19150503d80600081146102de576040519150601f19603f3d011682016040523d82523d6000602084013e6102e3565b606091505b5091509150816102f4576015610309565b808060200190518101906103089190610857565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161034c919061098a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516103b69190610973565b6000604051808303816000865af19150503d80600081146103f3576040519150601f19603f3d011682016040523d82523d6000602084013e6103f8565b606091505b50915091508161040957601561041e565b8080602001905181019061041d9190610857565b5b60030b92505050919050565b6104326106b3565b61043e8585858561016a565b60008061044a8761046b565b91509150601660030b821461045e57600080fd5b8092505050949350505050565b60006104756106b3565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663d614cdb860e01b866040516024016104aa919061098a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105149190610973565b6000604051808303816000865af19150503d8060008114610551576040519150601f19603f3d011682016040523d82523d6000602084013e610556565b606091505b50915091506105636106b3565b8261057057601581610585565b818060200190518101906105849190610884565b5b8160030b91508095508196505050505050915091565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663593d6e8260e01b86866040516024016105d49291906109a5565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161063e9190610973565b6000604051808303816000865af19150503d806000811461067b576040519150601f19603f3d011682016040523d82523d6000602084013e610680565b606091505b5091509150816106915760156106a6565b808060200190518101906106a59190610857565b5b60030b9250505092915050565b6040518060600160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600063ffffffff1681525090565b60008135905061070581610b46565b92915050565b60008151905061071a81610b46565b92915050565b60008151905061072f81610b5d565b92915050565b60006060828403121561074b5761074a610b2b565b5b6107556060610a04565b90506000610765848285016107ae565b60008301525060206107798482850161070b565b602083015250604061078d848285016107ae565b60408301525092915050565b6000813590506107a881610b74565b92915050565b6000815190506107bd81610b74565b92915050565b6000602082840312156107d9576107d8610b30565b5b60006107e7848285016106f6565b91505092915050565b6000806000806080858703121561080a57610809610b30565b5b6000610818878288016106f6565b945050602061082987828801610799565b935050604061083a878288016106f6565b925050606061084b87828801610799565b91505092959194509250565b60006020828403121561086d5761086c610b30565b5b600061087b84828501610720565b91505092915050565b6000806080838503121561089b5761089a610b30565b5b60006108a985828601610720565b92505060206108ba85828601610735565b9150509250929050565b6108cd81610a3f565b82525050565b6108dc81610a3f565b82525050565b60006108ed82610a29565b6108f78185610a34565b9350610907818560208601610a98565b80840191505092915050565b61091c81610a51565b82525050565b6060820160008201516109386000850182610964565b50602082015161094b60208501826108c4565b50604082015161095e6040850182610964565b50505050565b61096d81610a88565b82525050565b600061097f82846108e2565b915081905092915050565b600060208201905061099f60008301846108d3565b92915050565b60006080820190506109ba60008301856108d3565b6109c76020830184610922565b9392505050565b60006020820190506109e36000830184610913565b92915050565b60006060820190506109fe6000830184610922565b92915050565b6000610a0e610a1f565b9050610a1a8282610acb565b919050565b6000604051905090565b600081519050919050565b600081905092915050565b6000610a4a82610a68565b9050919050565b6000819050919050565b60008160030b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600063ffffffff82169050919050565b60005b83811015610ab6578082015181840152602081019050610a9b565b83811115610ac5576000848401525b50505050565b610ad482610b35565b810181811067ffffffffffffffff82111715610af357610af2610afc565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b610b4f81610a3f565b8114610b5a57600080fd5b50565b610b6681610a5b565b8114610b7157600080fd5b50565b610b7d81610a88565b8114610b8857600080fd5b5056fea26469706673582212208e7027c0d7c26d59599b7f5c45af2bdcb1b2e503df9d6cd4e675350d9f60e3e364736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.json
deleted file mode 100644
index d84c13f928c6..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.json
+++ /dev/null
@@ -1,155 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getExpiryInfoForToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiry",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "second",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "updateExpiryInfoForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "second",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "autoRenewPeriod",
-        "type": "uint32"
-      }
-    ],
-    "name": "updateExpiryInfoForTokenAndReadLatestInfo",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiry",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.bin
deleted file mode 100644
index b6a1302a41ee..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506144d5806100206000396000f3fe6080604052600436106100e85760003560e01c80637c41ad2c1161008a578063c79d386711610059578063c79d38671461038e578063d614cdb8146103cb578063edb12ce914610409578063f2c31ff414610425576100e8565b80637c41ad2c1461029a5780638e5e7996146102d75780638f8d7f9914610314578063af99c63314610351576100e8565b80634e262175116100c65780634e262175146101a6578063593d6e82146101e357806359c16f5a146102205780636c2d04631461025d576100e8565b806335589a13146100ed5780633b3bff0f1461012a57806344f38bc814610167575b600080fd5b3480156100f957600080fd5b50610114600480360381019061010f9190612bb3565b610463565b6040516101219190613f75565b60405180910390f35b34801561013657600080fd5b50610151600480360381019061014c9190612bb3565b610495565b60405161015e9190613e89565b60405180910390f35b34801561017357600080fd5b5061018e60048036038101906101899190612bb3565b6105aa565b60405161019d93929190613e3d565b60405180910390f35b3480156101b257600080fd5b506101cd60048036038101906101c89190612c60565b6105e8565b6040516101da9190613f53565b60405180910390f35b3480156101ef57600080fd5b5061020a60048036038101906102059190612e2b565b610756565b6040516102179190613e89565b60405180910390f35b34801561022c57600080fd5b5061024760048036038101906102429190612bb3565b61086e565b6040516102549190613f31565b60405180910390f35b34801561026957600080fd5b50610284600480360381019061027f9190612d4f565b6108a0565b6040516102919190613f75565b60405180910390f35b3480156102a657600080fd5b506102c160048036038101906102bc9190612bb3565b610a0c565b6040516102ce9190613e89565b60405180910390f35b3480156102e357600080fd5b506102fe60048036038101906102f99190612c20565b610b21565b60405161030b9190613f53565b60405180910390f35b34801561032057600080fd5b5061033b60048036038101906103369190612be0565b610b55565b6040516103489190613ecd565b60405180910390f35b34801561035d57600080fd5b5061037860048036038101906103739190612be0565b610c6d565b6040516103859190613ecd565b60405180910390f35b34801561039a57600080fd5b506103b560048036038101906103b09190612d4f565b610d85565b6040516103c29190613f31565b60405180910390f35b3480156103d757600080fd5b506103f260048036038101906103ed9190612bb3565b610ef1565b604051610400929190613ea4565b60405180910390f35b610423600480360381019061041e9190612be0565b611021565b005b34801561043157600080fd5b5061044c60048036038101906104479190612be0565b611265565b60405161045a929190613ee8565b60405180910390f35b61046b611d2c565b6000806104778461138a565b91509150601660030b821461048b57600080fd5b8092505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b856040516024016104cc9190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105369190613d07565b6000604051808303816000865af19150503d8060008114610573576040519150601f19603f3d011682016040523d82523d6000602084013e610578565b606091505b50915091508161058957601561059e565b8080602001905181019061059d9190612e6b565b5b60030b92505050919050565b606080606060006105ba856114ba565b8360070b935080955081965082975083945050505050601660030b81146105e057600080fd5b509193909250565b6105f0611d8e565b6105f8611dfc565b88888080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816000018190525086868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816020018190525084816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505083838080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505081606001819052506107218b826115f2565b5060008061072f8d8d61170a565b91509150601660030b821461074357600080fd5b8093505050509998505050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663593d6e8260e01b868660405160240161078f929190613dbb565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107f99190613d07565b6000604051808303816000865af19150503d8060008114610836576040519150601f19603f3d011682016040523d82523d6000602084013e61083b565b606091505b50915091508161084c576015610861565b808060200190518101906108609190612e6b565b5b60030b9250505092915050565b610876611e6b565b6000806108828461183e565b91509150601660030b821461089657600080fd5b8092505050919050565b6108a8611d2c565b6108b0611dfc565b88888080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816000018190525086868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816020018190525084816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505083838080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505081606001819052506109d98a826115f2565b506000806109e68c61138a565b91509150601660030b82146109fa57600080fd5b80935050505098975050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b85604051602401610a439190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610aad9190613d07565b6000604051808303816000865af19150503d8060008114610aea576040519150601f19603f3d011682016040523d82523d6000602084013e610aef565b606091505b509150915081610b00576015610b15565b80806020019051810190610b149190612e6b565b5b60030b92505050919050565b610b29611d8e565b600080610b36858561170a565b91509150601660030b8214610b4a57600080fd5b809250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b8686604051602401610b8e929190613d39565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610bf89190613d07565b6000604051808303816000865af19150503d8060008114610c35576040519150601f19603f3d011682016040523d82523d6000602084013e610c3a565b606091505b509150915081610c4b576015610c60565b80806020019051810190610c5f9190612e6b565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b8686604051602401610ca6929190613d39565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610d109190613d07565b6000604051808303816000865af19150503d8060008114610d4d576040519150601f19603f3d011682016040523d82523d6000602084013e610d52565b606091505b509150915081610d63576015610d78565b80806020019051810190610d779190612e6b565b5b60030b9250505092915050565b610d8d611e6b565b610d95611dfc565b88888080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816000018190525086868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050816020018190525084816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505083838080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508160600181905250610ebe8a826115f2565b50600080610ecb8c61183e565b91509150601660030b8214610edf57600080fd5b80935050505098975050505050505050565b6000610efb611e91565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663d614cdb860e01b86604051602401610f309190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f9a9190613d07565b6000604051808303816000865af19150503d8060008114610fd7576040519150601f19603f3d011682016040523d82523d6000602084013e610fdc565b606091505b5091509150610fe9611e91565b82610ff65760158161100b565b8180602001905181019061100a9190612f93565b5b8160030b91508095508196505050505050915091565b6000600767ffffffffffffffff81111561103e5761103d61436d565b5b60405190808252806020026020018201604052801561107757816020015b611064611ed4565b81526020019060019003908161105c5790505b509050611087600060028461196e565b8160008151811061109b5761109a61433e565b5b60200260200101819052506110b3600160028461196e565b816001815181106110c7576110c661433e565b5b60200260200101819052506110de6002808461196e565b816002815181106110f2576110f161433e565b5b602002602001018190525061110a600360028461196e565b8160038151811061111e5761111d61433e565b5b6020026020010181905250611136600460028461196e565b8160048151811061114a5761114961433e565b5b6020026020010181905250611162600660028461196e565b816005815181106111765761117561433e565b5b602002602001018190525061118e600560028461196e565b816006815181106111a2576111a161433e565b5b602002602001018190525060006111b984836119a5565b60070b9050601660030b8114611204576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111fb90613f11565b60405180910390fd5b61120f846001611abd565b505061121c846002611abd565b5050611229846004611abd565b5050611236846008611abd565b5050611243846010611abd565b5050611250846020611abd565b505061125d846040611abd565b505050505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663f2c31ff460e01b878760405160240161129f929190613d39565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516113099190613d07565b6000604051808303816000865af19150503d8060008114611346576040519150601f19603f3d011682016040523d82523d6000602084013e61134b565b606091505b50915091508161135e5760156000611373565b808060200190518101906113729190612f53565b5b8160030b9150809450819550505050509250929050565b6000611394611d2c565b60008061016773ffffffffffffffffffffffffffffffffffffffff16631f69565f60e01b866040516024016113c99190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516114339190613d07565b6000604051808303816000865af19150503d8060008114611470576040519150601f19603f3d011682016040523d82523d6000602084013e611475565b606091505b5091509150611482611d2c565b8261148f576015816114a4565b818060200190518101906114a391906130e7565b5b8160030b91508095508196505050505050915091565b6000606080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663ae7611a060e01b886040516024016114f69190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115609190613d07565b6000604051808303816000865af19150503d806000811461159d576040519150601f19603f3d011682016040523d82523d6000602084013e6115a2565b606091505b50915091506060806060846115bb5760158383836115d0565b838060200190518101906115cf9190612e98565b5b8360030b9350809950819a50829b50839c505050505050505050509193509193565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166318370d3460e01b868660405160240161162b929190613de4565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516116959190613d07565b6000604051808303816000865af19150503d80600081146116d2576040519150601f19603f3d011682016040523d82523d6000602084013e6116d7565b606091505b5091509150816116e85760156116fd565b808060200190518101906116fc9190612e6b565b5b60030b9250505092915050565b6000611714611d8e565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663287e1da860e01b878760405160240161174b929190613d92565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516117b59190613d07565b6000604051808303816000865af19150503d80600081146117f2576040519150601f19603f3d011682016040523d82523d6000602084013e6117f7565b606091505b5091509150611804611d8e565b8261181157601581611826565b81806020019051810190611825919061308b565b5b8160030b915080955081965050505050509250929050565b6000611848611e6b565b60008061016773ffffffffffffffffffffffffffffffffffffffff16633f28a19b60e01b8660405160240161187d9190613d1e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516118e79190613d07565b6000604051808303816000865af19150503d8060008114611924576040519150601f19603f3d011682016040523d82523d6000602084013e611929565b606091505b5091509150611936611e6b565b8261194357601581611958565b818060200190518101906119579190612fd3565b5b8160030b91508095508196505050505050915091565b611976611ed4565b604051806040016040528061198a86611bf1565b81526020016119998585611c8f565b81525090509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16636fc3cbaf60e01b86866040516024016119de929190613d62565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611a489190613d07565b6000604051808303816000865af19150503d8060008114611a85576040519150601f19603f3d011682016040523d82523d6000602084013e611a8a565b606091505b509150915081611a9b576015611ab0565b80806020019051810190611aaf9190612e6b565b5b60030b9250505092915050565b6000611ac7611ef4565b60008061016773ffffffffffffffffffffffffffffffffffffffff16633c4dd32e60e01b8787604051602401611afe929190613e14565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611b689190613d07565b6000604051808303816000865af19150503d8060008114611ba5576040519150601f19603f3d011682016040523d82523d6000602084013e611baa565b606091505b5091509150611bb7611ef4565b82611bc457601581611bd9565b81806020019051810190611bd8919061302f565b5b8160030b915080955081965050505050509250929050565b6000808260ff161415611c075760019050611c8a565b60018260ff161415611c1c5760029050611c8a565b60028260ff161415611c315760049050611c8a565b60038260ff161415611c465760089050611c8a565b60048260ff161415611c5b5760109050611c8a565b60058260ff161415611c705760209050611c8a565b60068260ff161415611c855760409050611c8a565b600090505b919050565b611c97611ef4565b60028360ff161415611ce05781816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050611d26565b60058360ff161415611d255781816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b5b92915050565b604051806101200160405280611d40611dfc565b8152602001600067ffffffffffffffff168152602001600015158152602001600015158152602001600015158152602001606081526020016060815260200160608152602001606081525090565b6040518060c00160405280611da1611d2c565b8152602001600060070b8152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600060070b815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b815260200160001515815260200160608152602001611e65611e91565b81525090565b6040518060400160405280611e7e611d2c565b8152602001600063ffffffff1681525090565b6040518060600160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600063ffffffff1681525090565b604051806040016040528060008152602001611eee611ef4565b81525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6000611f64611f5f84613fbc565b613f97565b905080838252602082019050828560a0860282011115611f8757611f866143b0565b5b60005b85811015611fb75781611f9d8882612463565b845260208401935060a08301925050600181019050611f8a565b5050509392505050565b6000611fd4611fcf84613fe8565b613f97565b905080838252602082019050828560c0860282011115611ff757611ff66143b0565b5b60005b85811015612027578161200d88826124ef565b845260208401935060c08301925050600181019050611ffa565b5050509392505050565b600061204461203f84614014565b613f97565b905080838252602082019050828560c0860282011115612067576120666143b0565b5b60005b85811015612097578161207d88826128e7565b845260208401935060c0830192505060018101905061206a565b5050509392505050565b60006120b46120af84614040565b613f97565b905080838252602082019050828560208602820111156120d7576120d66143b0565b5b60005b8581101561212557815167ffffffffffffffff8111156120fd576120fc6143a1565b5b80860161210a8982612af3565b855260208501945060208401935050506001810190506120da565b5050509392505050565b600061214261213d8461406c565b613f97565b90508281526020810184848401111561215e5761215d6143b5565b5b6121698482856142da565b509392505050565b600061218461217f8461409d565b613f97565b9050828152602081018484840111156121a05761219f6143b5565b5b6121ab8482856142da565b509392505050565b6000813590506121c2816143fe565b92915050565b6000815190506121d7816143fe565b92915050565b600082601f8301126121f2576121f16143a1565b5b8151612202848260208601611f51565b91505092915050565b600082601f8301126122205761221f6143a1565b5b8151612230848260208601611fc1565b91505092915050565b600082601f83011261224e5761224d6143a1565b5b815161225e848260208601612031565b91505092915050565b600082601f83011261227c5761227b6143a1565b5b815161228c8482602086016120a1565b91505092915050565b6000815190506122a481614415565b92915050565b600082601f8301126122bf576122be6143a1565b5b81516122cf84826020860161212f565b91505092915050565b6000815190506122e78161442c565b92915050565b6000813590506122fc81614443565b92915050565b60008151905061231181614443565b92915050565b60008083601f84011261232d5761232c6143a1565b5b8235905067ffffffffffffffff81111561234a5761234961439c565b5b602083019150836001820283011115612366576123656143b0565b5b9250929050565b600082601f830112612382576123816143a1565b5b8151612392848260208601612171565b91505092915050565b6000606082840312156123b1576123b06143a6565b5b6123bb6060613f97565b905060006123cb84828501612b74565b60008301525060206123df848285016121b3565b60208301525060406123f384828501612b74565b60408301525092915050565b600060608284031215612415576124146143a6565b5b61241f6060613f97565b9050600061242f84828501612b89565b6000830152506020612443848285016121c8565b602083015250604061245784828501612b89565b60408301525092915050565b600060a08284031215612479576124786143a6565b5b61248360a0613f97565b9050600061249384828501612b89565b60008301525060206124a7848285016121c8565b60208301525060406124bb84828501612295565b60408301525060606124cf84828501612295565b60608301525060806124e3848285016121c8565b60808301525092915050565b600060c08284031215612505576125046143a6565b5b61250f60c0613f97565b9050600061251f84828501612b89565b600083015250602061253384828501612b89565b602083015250604061254784828501612b89565b604083015250606061255b84828501612b89565b606083015250608061256f84828501612295565b60808301525060a0612583848285016121c8565b60a08301525092915050565b6000604082840312156125a5576125a46143a6565b5b6125af6040613f97565b9050600082015167ffffffffffffffff8111156125cf576125ce6143ab565b5b6125db84828501612987565b60008301525060206125ef84828501612b89565b60208301525092915050565b60006101608284031215612612576126116143a6565b5b61261d610120613f97565b9050600082015167ffffffffffffffff81111561263d5761263c6143ab565b5b6126498482850161236d565b600083015250602082015167ffffffffffffffff81111561266d5761266c6143ab565b5b6126798482850161236d565b602083015250604061268d848285016121c8565b604083015250606082015167ffffffffffffffff8111156126b1576126b06143ab565b5b6126bd8482850161236d565b60608301525060806126d184828501612295565b60808301525060a06126e584828501612302565b60a08301525060c06126f984828501612295565b60c08301525060e082015167ffffffffffffffff81111561271d5761271c6143ab565b5b61272984828501612267565b60e08301525061010061273e848285016123ff565b6101008301525092915050565b600060a08284031215612761576127606143a6565b5b61276b60a0613f97565b9050600061277b84828501612295565b600083015250602061278f848285016121c8565b602083015250604082015167ffffffffffffffff8111156127b3576127b26143ab565b5b6127bf848285016122aa565b604083015250606082015167ffffffffffffffff8111156127e3576127e26143ab565b5b6127ef848285016122aa565b6060830152506080612803848285016121c8565b60808301525092915050565b600060c08284031215612825576128246143a6565b5b61282f60c0613f97565b9050600082015167ffffffffffffffff81111561284f5761284e6143ab565b5b61285b84828501612987565b600083015250602061286f84828501612302565b6020830152506040612883848285016121c8565b604083015250606061289784828501612302565b606083015250608082015167ffffffffffffffff8111156128bb576128ba6143ab565b5b6128c7848285016122aa565b60808301525060a06128db848285016121c8565b60a08301525092915050565b600060c082840312156128fd576128fc6143a6565b5b61290760c0613f97565b9050600061291784828501612b89565b600083015250602061292b84828501612b89565b602083015250604061293f84828501612b89565b6040830152506060612953848285016121c8565b606083015250608061296784828501612295565b60808301525060a061297b848285016121c8565b60a08301525092915050565b6000610120828403121561299e5761299d6143a6565b5b6129a9610120613f97565b9050600082015167ffffffffffffffff8111156129c9576129c86143ab565b5b6129d5848285016125fb565b60008301525060206129e984828501612b9e565b60208301525060406129fd84828501612295565b6040830152506060612a1184828501612295565b6060830152506080612a2584828501612295565b60808301525060a082015167ffffffffffffffff811115612a4957612a486143ab565b5b612a55848285016121dd565b60a08301525060c082015167ffffffffffffffff811115612a7957612a786143ab565b5b612a858482850161220b565b60c08301525060e082015167ffffffffffffffff811115612aa957612aa86143ab565b5b612ab584828501612239565b60e08301525061010082015167ffffffffffffffff811115612ada57612ad96143ab565b5b612ae68482850161236d565b6101008301525092915050565b600060408284031215612b0957612b086143a6565b5b612b136040613f97565b90506000612b2384828501612b5f565b600083015250602082015167ffffffffffffffff811115612b4757612b466143ab565b5b612b538482850161274b565b60208301525092915050565b600081519050612b6e8161445a565b92915050565b600081359050612b8381614471565b92915050565b600081519050612b9881614471565b92915050565b600081519050612bad81614488565b92915050565b600060208284031215612bc957612bc86143bf565b5b6000612bd7848285016121b3565b91505092915050565b60008060408385031215612bf757612bf66143bf565b5b6000612c05858286016121b3565b9250506020612c16858286016121b3565b9150509250929050565b60008060408385031215612c3757612c366143bf565b5b6000612c45858286016121b3565b9250506020612c56858286016122ed565b9150509250929050565b600080600080600080600080600060c08a8c031215612c8257612c816143bf565b5b6000612c908c828d016121b3565b9950506020612ca18c828d016122ed565b98505060408a013567ffffffffffffffff811115612cc257612cc16143ba565b5b612cce8c828d01612317565b975097505060608a013567ffffffffffffffff811115612cf157612cf06143ba565b5b612cfd8c828d01612317565b95509550506080612d108c828d016121b3565b93505060a08a013567ffffffffffffffff811115612d3157612d306143ba565b5b612d3d8c828d01612317565b92509250509295985092959850929598565b60008060008060008060008060a0898b031215612d6f57612d6e6143bf565b5b6000612d7d8b828c016121b3565b985050602089013567ffffffffffffffff811115612d9e57612d9d6143ba565b5b612daa8b828c01612317565b9750975050604089013567ffffffffffffffff811115612dcd57612dcc6143ba565b5b612dd98b828c01612317565b95509550506060612dec8b828c016121b3565b935050608089013567ffffffffffffffff811115612e0d57612e0c6143ba565b5b612e198b828c01612317565b92509250509295985092959890939650565b60008060808385031215612e4257612e416143bf565b5b6000612e50858286016121b3565b9250506020612e618582860161239b565b9150509250929050565b600060208284031215612e8157612e806143bf565b5b6000612e8f848285016122d8565b91505092915050565b60008060008060808587031215612eb257612eb16143bf565b5b6000612ec0878288016122d8565b945050602085015167ffffffffffffffff811115612ee157612ee06143ba565b5b612eed878288016121dd565b935050604085015167ffffffffffffffff811115612f0e57612f0d6143ba565b5b612f1a8782880161220b565b925050606085015167ffffffffffffffff811115612f3b57612f3a6143ba565b5b612f4787828801612239565b91505092959194509250565b60008060408385031215612f6a57612f696143bf565b5b6000612f78858286016122d8565b9250506020612f8985828601612295565b9150509250929050565b60008060808385031215612faa57612fa96143bf565b5b6000612fb8858286016122d8565b9250506020612fc9858286016123ff565b9150509250929050565b60008060408385031215612fea57612fe96143bf565b5b6000612ff8858286016122d8565b925050602083015167ffffffffffffffff811115613019576130186143ba565b5b6130258582860161258f565b9150509250929050565b60008060408385031215613046576130456143bf565b5b6000613054858286016122d8565b925050602083015167ffffffffffffffff811115613075576130746143ba565b5b6130818582860161274b565b9150509250929050565b600080604083850312156130a2576130a16143bf565b5b60006130b0858286016122d8565b925050602083015167ffffffffffffffff8111156130d1576130d06143ba565b5b6130dd8582860161280f565b9150509250929050565b600080604083850312156130fe576130fd6143bf565b5b600061310c858286016122d8565b925050602083015167ffffffffffffffff81111561312d5761312c6143ba565b5b61313985828601612987565b9150509250929050565b600061314f8383613670565b60a08301905092915050565b600061316783836136d8565b60c08301905092915050565b600061317f8383613a51565b60c08301905092915050565b60006131978383613c8e565b905092915050565b6131a88161424a565b82525050565b6131b78161424a565b82525050565b60006131c88261410e565b6131d28185614184565b93506131dd836140ce565b8060005b8381101561320e5781516131f58882613143565b975061320083614150565b9250506001810190506131e1565b5085935050505092915050565b60006132268261410e565b6132308185614195565b935061323b836140ce565b8060005b8381101561326c5781516132538882613143565b975061325e83614150565b92505060018101905061323f565b5085935050505092915050565b600061328482614119565b61328e81856141a6565b9350613299836140de565b8060005b838110156132ca5781516132b1888261315b565b97506132bc8361415d565b92505060018101905061329d565b5085935050505092915050565b60006132e282614119565b6132ec81856141b7565b93506132f7836140de565b8060005b8381101561332857815161330f888261315b565b975061331a8361415d565b9250506001810190506132fb565b5085935050505092915050565b600061334082614124565b61334a81856141c8565b9350613355836140ee565b8060005b8381101561338657815161336d8882613173565b97506133788361416a565b925050600181019050613359565b5085935050505092915050565b600061339e82614124565b6133a881856141d9565b93506133b3836140ee565b8060005b838110156133e45781516133cb8882613173565b97506133d68361416a565b9250506001810190506133b7565b5085935050505092915050565b60006133fc8261412f565b61340681856141ea565b935083602082028501613418856140fe565b8060005b858110156134545784840389528151613435858261318b565b945061344083614177565b925060208a0199505060018101905061341c565b50829750879550505050505092915050565b60006134718261412f565b61347b81856141fb565b93508360208202850161348d856140fe565b8060005b858110156134c957848403895281516134aa858261318b565b94506134b583614177565b925060208a01995050600181019050613491565b50829750879550505050505092915050565b6134e48161425c565b82525050565b6134f38161425c565b82525050565b60006135048261413a565b61350e818561420c565b935061351e8185602086016142da565b613527816143c4565b840191505092915050565b600061353d8261413a565b613547818561421d565b93506135578185602086016142da565b80840191505092915050565b61356c81614268565b82525050565b61357b8161427f565b82525050565b61358a8161427f565b82525050565b600061359b82614145565b6135a58185614228565b93506135b58185602086016142da565b6135be816143c4565b840191505092915050565b60006135d6601c83614239565b91506135e1826143d5565b602082019050919050565b6060820160008201516136026000850182613ce9565b506020820151613615602085018261319f565b5060408201516136286040850182613ce9565b50505050565b6060820160008201516136446000850182613ce9565b506020820151613657602085018261319f565b50604082015161366a6040850182613ce9565b50505050565b60a0820160008201516136866000850182613ce9565b506020820151613699602085018261319f565b5060408201516136ac60408501826134db565b5060608201516136bf60608501826134db565b5060808201516136d2608085018261319f565b50505050565b60c0820160008201516136ee6000850182613ce9565b5060208201516137016020850182613ce9565b5060408201516137146040850182613ce9565b5060608201516137276060850182613ce9565b50608082015161373a60808501826134db565b5060a082015161374d60a085018261319f565b50505050565b600060408301600083015184820360008601526137708282613acc565b91505060208301516137856020860182613ce9565b508091505092915050565b60006101608301600083015184820360008601526137ae8282613590565b915050602083015184820360208601526137c88282613590565b91505060408301516137dd604086018261319f565b50606083015184820360608601526137f58282613590565b915050608083015161380a60808601826134db565b5060a083015161381d60a0860182613572565b5060c083015161383060c08601826134db565b5060e083015184820360e086015261384882826133f1565b91505061010083015161385f6101008601826135ec565b508091505092915050565b60006101608301600083015184820360008601526138888282613590565b915050602083015184820360208601526138a28282613590565b91505060408301516138b7604086018261319f565b50606083015184820360608601526138cf8282613590565b91505060808301516138e460808601826134db565b5060a08301516138f760a0860182613572565b5060c083015161390a60c08601826134db565b5060e083015184820360e086015261392282826133f1565b9150506101008301516139396101008601826135ec565b508091505092915050565b600060a08301600083015161395c60008601826134db565b50602083015161396f602086018261319f565b506040830151848203604086015261398782826134f9565b915050606083015184820360608601526139a182826134f9565b91505060808301516139b6608086018261319f565b508091505092915050565b600060c08301600083015184820360008601526139de8282613acc565b91505060208301516139f36020860182613572565b506040830151613a06604086018261319f565b506060830151613a196060860182613572565b5060808301518482036080860152613a3182826134f9565b91505060a0830151613a4660a086018261319f565b508091505092915050565b60c082016000820151613a676000850182613ce9565b506020820151613a7a6020850182613ce9565b506040820151613a8d6040850182613ce9565b506060820151613aa0606085018261319f565b506080820151613ab360808501826134db565b5060a0820151613ac660a085018261319f565b50505050565b6000610120830160008301518482036000860152613aea8282613790565b9150506020830151613aff6020860182613cf8565b506040830151613b1260408601826134db565b506060830151613b2560608601826134db565b506080830151613b3860808601826134db565b5060a083015184820360a0860152613b5082826131bd565b91505060c083015184820360c0860152613b6a8282613279565b91505060e083015184820360e0860152613b848282613335565b915050610100830151848203610100860152613ba08282613590565b9150508091505092915050565b6000610120830160008301518482036000860152613bcb8282613790565b9150506020830151613be06020860182613cf8565b506040830151613bf360408601826134db565b506060830151613c0660608601826134db565b506080830151613c1960808601826134db565b5060a083015184820360a0860152613c3182826131bd565b91505060c083015184820360c0860152613c4b8282613279565b91505060e083015184820360e0860152613c658282613335565b915050610100830151848203610100860152613c818282613590565b9150508091505092915050565b6000604083016000830151613ca66000860182613ccb565b5060208301518482036020860152613cbe8282613944565b9150508091505092915050565b613cd4816142ac565b82525050565b613ce3816142ac565b82525050565b613cf2816142b6565b82525050565b613d01816142c6565b82525050565b6000613d138284613532565b915081905092915050565b6000602082019050613d3360008301846131ae565b92915050565b6000604082019050613d4e60008301856131ae565b613d5b60208301846131ae565b9392505050565b6000604082019050613d7760008301856131ae565b8181036020830152613d898184613466565b90509392505050565b6000604082019050613da760008301856131ae565b613db46020830184613581565b9392505050565b6000608082019050613dd060008301856131ae565b613ddd602083018461362e565b9392505050565b6000604082019050613df960008301856131ae565b8181036020830152613e0b818461386a565b90509392505050565b6000604082019050613e2960008301856131ae565b613e366020830184613cda565b9392505050565b60006060820190508181036000830152613e57818661321b565b90508181036020830152613e6b81856132d7565b90508181036040830152613e7f8184613393565b9050949350505050565b6000602082019050613e9e6000830184613563565b92915050565b6000608082019050613eb96000830185613563565b613ec6602083018461362e565b9392505050565b6000602082019050613ee26000830184613581565b92915050565b6000604082019050613efd6000830185613581565b613f0a60208301846134ea565b9392505050565b60006020820190508181036000830152613f2a816135c9565b9050919050565b60006020820190508181036000830152613f4b8184613753565b905092915050565b60006020820190508181036000830152613f6d81846139c1565b905092915050565b60006020820190508181036000830152613f8f8184613bad565b905092915050565b6000613fa1613fb2565b9050613fad828261430d565b919050565b6000604051905090565b600067ffffffffffffffff821115613fd757613fd661436d565b5b602082029050602081019050919050565b600067ffffffffffffffff8211156140035761400261436d565b5b602082029050602081019050919050565b600067ffffffffffffffff82111561402f5761402e61436d565b5b602082029050602081019050919050565b600067ffffffffffffffff82111561405b5761405a61436d565b5b602082029050602081019050919050565b600067ffffffffffffffff8211156140875761408661436d565b5b614090826143c4565b9050602081019050919050565b600067ffffffffffffffff8211156140b8576140b761436d565b5b6140c1826143c4565b9050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b60006142558261428c565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600063ffffffff82169050919050565b600067ffffffffffffffff82169050919050565b60005b838110156142f85780820151818401526020810190506142dd565b83811115614307576000848401525b50505050565b614316826143c4565b810181811067ffffffffffffffff821117156143355761433461436d565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f557064617465206f6620746f6b656e206b657973206661696c65642100000000600082015250565b6144078161424a565b811461441257600080fd5b50565b61441e8161425c565b811461442957600080fd5b50565b61443581614272565b811461444057600080fd5b50565b61444c8161427f565b811461445757600080fd5b50565b614463816142ac565b811461446e57600080fd5b50565b61447a816142b6565b811461448557600080fd5b50565b614491816142c6565b811461449c57600080fd5b5056fea2646970667358221220e8a6d7003585591a73b7f9e1c7dd3cab11ba171c4ae3df21da64edb3ff03a13764736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.json
deleted file mode 100644
index f4048de63233..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.json
+++ /dev/null
@@ -1,2055 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getCustomFeesForToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "amount",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "tokenId",
-            "type": "address"
-          },
-          {
-            "internalType": "bool",
-            "name": "useHbarsForPayment",
-            "type": "bool"
-          },
-          {
-            "internalType": "bool",
-            "name": "useCurrentTokenForPayment",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "feeCollector",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.FixedFee[]",
-        "name": "fixedFees",
-        "type": "tuple[]"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "numerator",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint32",
-            "name": "denominator",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint32",
-            "name": "minimumAmount",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint32",
-            "name": "maximumAmount",
-            "type": "uint32"
-          },
-          {
-            "internalType": "bool",
-            "name": "netOfTransfers",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "feeCollector",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.FractionalFee[]",
-        "name": "fractionalFees",
-        "type": "tuple[]"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "numerator",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint32",
-            "name": "denominator",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint32",
-            "name": "amount",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "tokenId",
-            "type": "address"
-          },
-          {
-            "internalType": "bool",
-            "name": "useHbarsForPayment",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "feeCollector",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-        "name": "royaltyFees",
-        "type": "tuple[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getInformationForFungibleToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "components": [
-                  {
-                    "internalType": "string",
-                    "name": "name",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "symbol",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "treasury",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "memo",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "tokenSupplyType",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "int64",
-                    "name": "maxSupply",
-                    "type": "int64"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "freezeDefault",
-                    "type": "bool"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint256",
-                        "name": "keyType",
-                        "type": "uint256"
-                      },
-                      {
-                        "components": [
-                          {
-                            "internalType": "bool",
-                            "name": "inheritAccountKey",
-                            "type": "bool"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "contractId",
-                            "type": "address"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ed25519",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ECDSA_secp256k1",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "delegatableContractId",
-                            "type": "address"
-                          }
-                        ],
-                        "internalType": "struct IHederaTokenService.KeyValue",
-                        "name": "key",
-                        "type": "tuple"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.TokenKey[]",
-                    "name": "tokenKeys",
-                    "type": "tuple[]"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint32",
-                        "name": "second",
-                        "type": "uint32"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "autoRenewAccount",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "uint32",
-                        "name": "autoRenewPeriod",
-                        "type": "uint32"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.Expiry",
-                    "name": "expiry",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.HederaToken",
-                "name": "token",
-                "type": "tuple"
-              },
-              {
-                "internalType": "uint64",
-                "name": "totalSupply",
-                "type": "uint64"
-              },
-              {
-                "internalType": "bool",
-                "name": "deleted",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "defaultKycStatus",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "pauseStatus",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useCurrentTokenForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FixedFee[]",
-                "name": "fixedFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "minimumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "maximumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "netOfTransfers",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FractionalFee[]",
-                "name": "fractionalFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-                "name": "royaltyFees",
-                "type": "tuple[]"
-              },
-              {
-                "internalType": "string",
-                "name": "ledgerId",
-                "type": "string"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.TokenInfo",
-            "name": "tokenInfo",
-            "type": "tuple"
-          },
-          {
-            "internalType": "uint32",
-            "name": "decimals",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.FungibleTokenInfo",
-        "name": "fungibleTokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      }
-    ],
-    "name": "getInformationForNonFungibleToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "components": [
-                  {
-                    "internalType": "string",
-                    "name": "name",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "symbol",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "treasury",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "memo",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "tokenSupplyType",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "int64",
-                    "name": "maxSupply",
-                    "type": "int64"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "freezeDefault",
-                    "type": "bool"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint256",
-                        "name": "keyType",
-                        "type": "uint256"
-                      },
-                      {
-                        "components": [
-                          {
-                            "internalType": "bool",
-                            "name": "inheritAccountKey",
-                            "type": "bool"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "contractId",
-                            "type": "address"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ed25519",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ECDSA_secp256k1",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "delegatableContractId",
-                            "type": "address"
-                          }
-                        ],
-                        "internalType": "struct IHederaTokenService.KeyValue",
-                        "name": "key",
-                        "type": "tuple"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.TokenKey[]",
-                    "name": "tokenKeys",
-                    "type": "tuple[]"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint32",
-                        "name": "second",
-                        "type": "uint32"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "autoRenewAccount",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "uint32",
-                        "name": "autoRenewPeriod",
-                        "type": "uint32"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.Expiry",
-                    "name": "expiry",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.HederaToken",
-                "name": "token",
-                "type": "tuple"
-              },
-              {
-                "internalType": "uint64",
-                "name": "totalSupply",
-                "type": "uint64"
-              },
-              {
-                "internalType": "bool",
-                "name": "deleted",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "defaultKycStatus",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "pauseStatus",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useCurrentTokenForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FixedFee[]",
-                "name": "fixedFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "minimumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "maximumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "netOfTransfers",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FractionalFee[]",
-                "name": "fractionalFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-                "name": "royaltyFees",
-                "type": "tuple[]"
-              },
-              {
-                "internalType": "string",
-                "name": "ledgerId",
-                "type": "string"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.TokenInfo",
-            "name": "tokenInfo",
-            "type": "tuple"
-          },
-          {
-            "internalType": "int64",
-            "name": "serialNumber",
-            "type": "int64"
-          },
-          {
-            "internalType": "address",
-            "name": "ownerId",
-            "type": "address"
-          },
-          {
-            "internalType": "int64",
-            "name": "creationTime",
-            "type": "int64"
-          },
-          {
-            "internalType": "bytes",
-            "name": "metadata",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "spenderId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.NonFungibleTokenInfo",
-        "name": "nonFungibleTokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getInformationForToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "string",
-                "name": "name",
-                "type": "string"
-              },
-              {
-                "internalType": "string",
-                "name": "symbol",
-                "type": "string"
-              },
-              {
-                "internalType": "address",
-                "name": "treasury",
-                "type": "address"
-              },
-              {
-                "internalType": "string",
-                "name": "memo",
-                "type": "string"
-              },
-              {
-                "internalType": "bool",
-                "name": "tokenSupplyType",
-                "type": "bool"
-              },
-              {
-                "internalType": "int64",
-                "name": "maxSupply",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "freezeDefault",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint256",
-                    "name": "keyType",
-                    "type": "uint256"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "bool",
-                        "name": "inheritAccountKey",
-                        "type": "bool"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "contractId",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "bytes",
-                        "name": "ed25519",
-                        "type": "bytes"
-                      },
-                      {
-                        "internalType": "bytes",
-                        "name": "ECDSA_secp256k1",
-                        "type": "bytes"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "delegatableContractId",
-                        "type": "address"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.KeyValue",
-                    "name": "key",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.TokenKey[]",
-                "name": "tokenKeys",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "second",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "autoRenewAccount",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "autoRenewPeriod",
-                    "type": "uint32"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.Expiry",
-                "name": "expiry",
-                "type": "tuple"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.HederaToken",
-            "name": "token",
-            "type": "tuple"
-          },
-          {
-            "internalType": "uint64",
-            "name": "totalSupply",
-            "type": "uint64"
-          },
-          {
-            "internalType": "bool",
-            "name": "deleted",
-            "type": "bool"
-          },
-          {
-            "internalType": "bool",
-            "name": "defaultKycStatus",
-            "type": "bool"
-          },
-          {
-            "internalType": "bool",
-            "name": "pauseStatus",
-            "type": "bool"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "amount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "address",
-                "name": "tokenId",
-                "type": "address"
-              },
-              {
-                "internalType": "bool",
-                "name": "useHbarsForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "useCurrentTokenForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.FixedFee[]",
-            "name": "fixedFees",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "numerator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "denominator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "minimumAmount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "maximumAmount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "bool",
-                "name": "netOfTransfers",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.FractionalFee[]",
-            "name": "fractionalFees",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "numerator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "denominator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "amount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "address",
-                "name": "tokenId",
-                "type": "address"
-              },
-              {
-                "internalType": "bool",
-                "name": "useHbarsForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-            "name": "royaltyFees",
-            "type": "tuple[]"
-          },
-          {
-            "internalType": "string",
-            "name": "ledgerId",
-            "type": "string"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenInfo",
-        "name": "tokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "memo",
-        "type": "string"
-      }
-    ],
-    "name": "updateInformationForFungibleTokenAndGetLatestInformation",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "components": [
-                  {
-                    "internalType": "string",
-                    "name": "name",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "symbol",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "treasury",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "memo",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "tokenSupplyType",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "int64",
-                    "name": "maxSupply",
-                    "type": "int64"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "freezeDefault",
-                    "type": "bool"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint256",
-                        "name": "keyType",
-                        "type": "uint256"
-                      },
-                      {
-                        "components": [
-                          {
-                            "internalType": "bool",
-                            "name": "inheritAccountKey",
-                            "type": "bool"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "contractId",
-                            "type": "address"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ed25519",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ECDSA_secp256k1",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "delegatableContractId",
-                            "type": "address"
-                          }
-                        ],
-                        "internalType": "struct IHederaTokenService.KeyValue",
-                        "name": "key",
-                        "type": "tuple"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.TokenKey[]",
-                    "name": "tokenKeys",
-                    "type": "tuple[]"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint32",
-                        "name": "second",
-                        "type": "uint32"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "autoRenewAccount",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "uint32",
-                        "name": "autoRenewPeriod",
-                        "type": "uint32"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.Expiry",
-                    "name": "expiry",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.HederaToken",
-                "name": "token",
-                "type": "tuple"
-              },
-              {
-                "internalType": "uint64",
-                "name": "totalSupply",
-                "type": "uint64"
-              },
-              {
-                "internalType": "bool",
-                "name": "deleted",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "defaultKycStatus",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "pauseStatus",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useCurrentTokenForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FixedFee[]",
-                "name": "fixedFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "minimumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "maximumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "netOfTransfers",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FractionalFee[]",
-                "name": "fractionalFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-                "name": "royaltyFees",
-                "type": "tuple[]"
-              },
-              {
-                "internalType": "string",
-                "name": "ledgerId",
-                "type": "string"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.TokenInfo",
-            "name": "tokenInfo",
-            "type": "tuple"
-          },
-          {
-            "internalType": "uint32",
-            "name": "decimals",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.FungibleTokenInfo",
-        "name": "fungibleTokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      },
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "memo",
-        "type": "string"
-      }
-    ],
-    "name": "updateInformationForNonFungibleTokenAndGetLatestInformation",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "components": [
-                  {
-                    "internalType": "string",
-                    "name": "name",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "symbol",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "treasury",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "string",
-                    "name": "memo",
-                    "type": "string"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "tokenSupplyType",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "int64",
-                    "name": "maxSupply",
-                    "type": "int64"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "freezeDefault",
-                    "type": "bool"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint256",
-                        "name": "keyType",
-                        "type": "uint256"
-                      },
-                      {
-                        "components": [
-                          {
-                            "internalType": "bool",
-                            "name": "inheritAccountKey",
-                            "type": "bool"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "contractId",
-                            "type": "address"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ed25519",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "bytes",
-                            "name": "ECDSA_secp256k1",
-                            "type": "bytes"
-                          },
-                          {
-                            "internalType": "address",
-                            "name": "delegatableContractId",
-                            "type": "address"
-                          }
-                        ],
-                        "internalType": "struct IHederaTokenService.KeyValue",
-                        "name": "key",
-                        "type": "tuple"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.TokenKey[]",
-                    "name": "tokenKeys",
-                    "type": "tuple[]"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "uint32",
-                        "name": "second",
-                        "type": "uint32"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "autoRenewAccount",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "uint32",
-                        "name": "autoRenewPeriod",
-                        "type": "uint32"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.Expiry",
-                    "name": "expiry",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.HederaToken",
-                "name": "token",
-                "type": "tuple"
-              },
-              {
-                "internalType": "uint64",
-                "name": "totalSupply",
-                "type": "uint64"
-              },
-              {
-                "internalType": "bool",
-                "name": "deleted",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "defaultKycStatus",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "pauseStatus",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useCurrentTokenForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FixedFee[]",
-                "name": "fixedFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "minimumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "maximumAmount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "netOfTransfers",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.FractionalFee[]",
-                "name": "fractionalFees",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "numerator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "denominator",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "amount",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "tokenId",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bool",
-                    "name": "useHbarsForPayment",
-                    "type": "bool"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "feeCollector",
-                    "type": "address"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-                "name": "royaltyFees",
-                "type": "tuple[]"
-              },
-              {
-                "internalType": "string",
-                "name": "ledgerId",
-                "type": "string"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.TokenInfo",
-            "name": "tokenInfo",
-            "type": "tuple"
-          },
-          {
-            "internalType": "int64",
-            "name": "serialNumber",
-            "type": "int64"
-          },
-          {
-            "internalType": "address",
-            "name": "ownerId",
-            "type": "address"
-          },
-          {
-            "internalType": "int64",
-            "name": "creationTime",
-            "type": "int64"
-          },
-          {
-            "internalType": "bytes",
-            "name": "metadata",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "spenderId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.NonFungibleTokenInfo",
-        "name": "nonFungibleTokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenId",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "memo",
-        "type": "string"
-      }
-    ],
-    "name": "updateInformationForTokenAndGetLatestInformation",
-    "outputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "string",
-                "name": "name",
-                "type": "string"
-              },
-              {
-                "internalType": "string",
-                "name": "symbol",
-                "type": "string"
-              },
-              {
-                "internalType": "address",
-                "name": "treasury",
-                "type": "address"
-              },
-              {
-                "internalType": "string",
-                "name": "memo",
-                "type": "string"
-              },
-              {
-                "internalType": "bool",
-                "name": "tokenSupplyType",
-                "type": "bool"
-              },
-              {
-                "internalType": "int64",
-                "name": "maxSupply",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "freezeDefault",
-                "type": "bool"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint256",
-                    "name": "keyType",
-                    "type": "uint256"
-                  },
-                  {
-                    "components": [
-                      {
-                        "internalType": "bool",
-                        "name": "inheritAccountKey",
-                        "type": "bool"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "contractId",
-                        "type": "address"
-                      },
-                      {
-                        "internalType": "bytes",
-                        "name": "ed25519",
-                        "type": "bytes"
-                      },
-                      {
-                        "internalType": "bytes",
-                        "name": "ECDSA_secp256k1",
-                        "type": "bytes"
-                      },
-                      {
-                        "internalType": "address",
-                        "name": "delegatableContractId",
-                        "type": "address"
-                      }
-                    ],
-                    "internalType": "struct IHederaTokenService.KeyValue",
-                    "name": "key",
-                    "type": "tuple"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.TokenKey[]",
-                "name": "tokenKeys",
-                "type": "tuple[]"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "uint32",
-                    "name": "second",
-                    "type": "uint32"
-                  },
-                  {
-                    "internalType": "address",
-                    "name": "autoRenewAccount",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "uint32",
-                    "name": "autoRenewPeriod",
-                    "type": "uint32"
-                  }
-                ],
-                "internalType": "struct IHederaTokenService.Expiry",
-                "name": "expiry",
-                "type": "tuple"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.HederaToken",
-            "name": "token",
-            "type": "tuple"
-          },
-          {
-            "internalType": "uint64",
-            "name": "totalSupply",
-            "type": "uint64"
-          },
-          {
-            "internalType": "bool",
-            "name": "deleted",
-            "type": "bool"
-          },
-          {
-            "internalType": "bool",
-            "name": "defaultKycStatus",
-            "type": "bool"
-          },
-          {
-            "internalType": "bool",
-            "name": "pauseStatus",
-            "type": "bool"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "amount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "address",
-                "name": "tokenId",
-                "type": "address"
-              },
-              {
-                "internalType": "bool",
-                "name": "useHbarsForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "bool",
-                "name": "useCurrentTokenForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.FixedFee[]",
-            "name": "fixedFees",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "numerator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "denominator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "minimumAmount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "maximumAmount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "bool",
-                "name": "netOfTransfers",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.FractionalFee[]",
-            "name": "fractionalFees",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "uint32",
-                "name": "numerator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "denominator",
-                "type": "uint32"
-              },
-              {
-                "internalType": "uint32",
-                "name": "amount",
-                "type": "uint32"
-              },
-              {
-                "internalType": "address",
-                "name": "tokenId",
-                "type": "address"
-              },
-              {
-                "internalType": "bool",
-                "name": "useHbarsForPayment",
-                "type": "bool"
-              },
-              {
-                "internalType": "address",
-                "name": "feeCollector",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.RoyaltyFee[]",
-            "name": "royaltyFees",
-            "type": "tuple[]"
-          },
-          {
-            "internalType": "string",
-            "name": "ledgerId",
-            "type": "string"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenInfo",
-        "name": "tokenInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      }
-    ],
-    "name": "updateTokenKeysAndReadLatestInformation",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.bin
deleted file mode 100644
index 4eb20ee68090..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50600160208181527fa6eef7e35abe7026729641147f7915573c7e97b47efa546f5f6e3230263bcb499190915560027fcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f5560047fd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f5560087f7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b5560107fedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643557fe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c55600660005260407f8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a556110b3806101276000396000f3fe608060405234801561001057600080fd5b50600436106100b95760003560e01c80639b23d3d911610081578063b2d8461c1161005b578063b2d8461c1461016f578063c8c04a0914610182578063f00729901461019557600080fd5b80639b23d3d9146101365780639bc2f98214610149578063a1a2497d1461015c57600080fd5b806315dacbea146100be5780631e5f0ad4146100e8578063618dc65e146100fd5780638c649cf91461011057806398142caf14610123575b600080fd5b6100d16100cc366004610acb565b6101a8565b60405160079190910b815260200160405180910390f35b6100fb6100f6366004610b16565b61029c565b005b6100fb61010b366004610c06565b610337565b6100fb61011e366004610c54565b610425565b6100fb610131366004610cac565b610498565b6100d1610144366004610acb565b6104d7565b6100fb610157366004610cee565b61051c565b6100fb61016a366004610c54565b6105ef565b6100fb61017d366004610d31565b610606565b6100fb610190366004610c54565b61062b565b6100fb6101a3366004610cac565b610646565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516102279190610db2565b6000604051808303816000865af19150503d8060008114610264576040519150601f19603f3d011682016040523d82523d6000602084013e610269565b606091505b50915091508161027a57601561028e565b8080602001905181019061028e9190610dce565b60030b979650505050505050565b6102a46109ef565b60408051606081018252600080825260208201819052600785900b928201929092526101008301819052906102d98584610665565b9050601681146103305760405162461bcd60e51b815260206004820152601b60248201527f557064617465206f6620746f6b656e496e666f206661696c656421000000000060448201526064015b60405180910390fd5b5050505050565b6000806101676001600160a01b031663618dc65e60e01b8585604051602401610361929190610e1d565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161039f9190610db2565b6000604051808303816000865af19150503d80600081146103dc576040519150601f19603f3d011682016040523d82523d6000602084013e6103e1565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc8282604051610417929190610e47565b60405180910390a150505050565b61042d6109ef565b6060810182905260006104408483610665565b9050601681146104925760405162461bcd60e51b815260206004820152601b60248201527f557064617465206f6620746f6b656e496e666f206661696c65642100000000006044820152606401610327565b50505050565b6104a06109ef565b6040805160608101825260008082529181018290526001600160a01b03841660208201526101008301819052906102d98584610665565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a4016101e9565b6105246109ef565b604080516001808252818301909252600091816020015b610543610a57565b81526020019060019003908161053b57905050905061056483600186610742565b8160008151811061057757610577610e62565b602090810291909101015260e0820181905260006105958684610665565b9050601681146105e75760405162461bcd60e51b815260206004820152601b60248201527f557064617465206f6620746f6b656e496e666f206661696c65642100000000006044820152606401610327565b505050505050565b6105f76109ef565b81815260006104408483610665565b61060e6109ef565b61061a82600285610777565b60e082015260006102d98583610665565b6106336109ef565b6020810182905260006104408483610665565b61064e6109ef565b6001600160a01b0382166040820152600061044084835b60008060006101676001600160a01b0316637d305cfa60e01b8686604051602401610691929190610f3c565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b03199094169390931790925290516106cf9190610db2565b6000604051808303816000865af19150503d806000811461070c576040519150601f19603f3d011682016040523d82523d6000602084013e610711565b606091505b509150915081610722576015610736565b808060200190518101906107369190610dce565b60030b95945050505050565b61074a610a57565b604051806040016040528061075e866107f6565b815260200161076d8585610835565b9052949350505050565b604080516001808252818301909252606091816020015b610796610a57565b81526020019060019003908161078e57905050905060405180604001604052806107bf866107f6565b81526020016107ce85856108d9565b815250816000815181106107e4576107e4610e62565b60200260200101819052509392505050565b60006001600083600681111561080e5761080e611067565b600681111561081f5761081f611067565b8152602001908152602001600020549050919050565b61087b6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b600183600481111561088f5761088f611067565b14156108a9576001600160a01b03821660208201526108d3565b60048360048111156108bd576108bd611067565b14156108d3576001600160a01b03821660808201525b92915050565b61091f6040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b600083600481111561093357610933611067565b141561094257600181526108d3565b600183600481111561095657610956611067565b1415610972576000546001600160a01b031660208201526108d3565b600283600481111561098657610986611067565b141561099857604081018290526108d3565b60038360048111156109ac576109ac611067565b14156109be57606081018290526108d3565b60048360048111156109d2576109d2611067565b14156108d3576000546001600160a01b0316608082015292915050565b60408051610120810182526060808252602080830182905260008385018190528284018390526080840181905260a0840181905260c0840181905260e0840183905284519283018552808352908201819052928101929092529061010082015290565b905290565b604051806040016040528060008152602001610a526040518060a0016040528060001515815260200160006001600160a01b03168152602001606081526020016060815260200160006001600160a01b031681525090565b80356001600160a01b0381168114610ac657600080fd5b919050565b60008060008060808587031215610ae157600080fd5b610aea85610aaf565b9350610af860208601610aaf565b9250610b0660408601610aaf565b9396929550929360600135925050565b60008060408385031215610b2957600080fd5b610b3283610aaf565b915060208301358060070b8114610b4857600080fd5b809150509250929050565b634e487b7160e01b600052604160045260246000fd5b600067ffffffffffffffff80841115610b8457610b84610b53565b604051601f8501601f19908116603f01168101908282118183101715610bac57610bac610b53565b81604052809350858152868686011115610bc557600080fd5b858560208301376000602087830101525050509392505050565b600082601f830112610bf057600080fd5b610bff83833560208501610b69565b9392505050565b60008060408385031215610c1957600080fd5b610c2283610aaf565b9150602083013567ffffffffffffffff811115610c3e57600080fd5b610c4a85828601610bdf565b9150509250929050565b60008060408385031215610c6757600080fd5b610c7083610aaf565b9150602083013567ffffffffffffffff811115610c8c57600080fd5b8301601f81018513610c9d57600080fd5b610c4a85823560208401610b69565b60008060408385031215610cbf57600080fd5b610cc883610aaf565b9150610cd660208401610aaf565b90509250929050565b803560078110610ac657600080fd5b600080600060608486031215610d0357600080fd5b610d0c84610aaf565b9250610d1a60208501610aaf565b9150610d2860408501610cdf565b90509250925092565b600080600060608486031215610d4657600080fd5b610d4f84610aaf565b9250602084013567ffffffffffffffff811115610d6b57600080fd5b610d7786828701610bdf565b925050610d2860408501610cdf565b60005b83811015610da1578181015183820152602001610d89565b838111156104925750506000910152565b60008251610dc4818460208701610d86565b9190910192915050565b600060208284031215610de057600080fd5b81518060030b8114610bff57600080fd5b60008151808452610e09816020860160208601610d86565b601f01601f19169290920160200192915050565b6001600160a01b0383168152604060208201526000610e3f6040830184610df1565b949350505050565b8215158152604060208201526000610e3f6040830184610df1565b634e487b7160e01b600052603260045260246000fd5b600081518084526020808501808196508360051b8101915082860160005b85811015610f2f5782840389528151604081518652868201519150808787015281511515818701528682015160606001600160a01b03808316828a015283850151935060a09250608083818b0152610ef160e08b0186610df1565b928601518a8403603f1901858c0152929450610f0d8584610df1565b9501511660c09890980197909752505098850198935090840190600101610e96565b5091979650505050505050565b6001600160a01b038316815260406020820152600082516101606040840152610f696101a0840182610df1565b90506020840151603f1980858403016060860152610f878383610df1565b925060408601519150610fa560808601836001600160a01b03169052565b60608601519150808584030160a0860152610fc08383610df1565b925060808601519150610fd760c086018315159052565b60a08601519150610fed60e086018360070b9052565b60c086015191506101006110048187018415159052565b60e0870151925081868503016101208701526110208484610e78565b908701518051600790810b61014089015260208201516001600160a01b03166101608901526040820151900b610180880152909350915061105e9050565b50949350505050565b634e487b7160e01b600052602160045260246000fdfea264697066735822122042878992db6d76a40cfc39313e31aff09c7cc8234add74b5c93f4b6d550d0a7964736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.json
deleted file mode 100644
index 1f637c75ed3e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      }
-    ],
-    "name": "updateTokenAutoRenewAccount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "autoRenewPeriod",
-        "type": "int64"
-      }
-    ],
-    "name": "updateTokenAutoRenewPeriod",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "contractId",
-        "type": "address"
-      },
-      {
-        "internalType": "enum KeyHelper.KeyType",
-        "name": "keyType",
-        "type": "uint8"
-      }
-    ],
-    "name": "updateTokenKeyContractId",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "newKey",
-        "type": "bytes"
-      },
-      {
-        "internalType": "enum KeyHelper.KeyType",
-        "name": "keyType",
-        "type": "uint8"
-      }
-    ],
-    "name": "updateTokenKeyEd",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "memo",
-        "type": "string"
-      }
-    ],
-    "name": "updateTokenMemo",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      }
-    ],
-    "name": "updateTokenName",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol",
-        "type": "string"
-      }
-    ],
-    "name": "updateTokenSymbol",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "updateTokenTreasury",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.bin
deleted file mode 100644
index 64fee1a8db2e..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526040518060400160405280600981526020017f746f6b656e4e616d65000000000000000000000000000000000000000000000081525060019080519060200190620000519291906200010c565b506040518060400160405280600b81526020017f746f6b656e53796d626f6c000000000000000000000000000000000000000000815250600290805190602001906200009f9291906200010c565b506040518060400160405280600481526020017f6d656d6f0000000000000000000000000000000000000000000000000000000081525060039080519060200190620000ed9291906200010c565b5060c860045560086005553480156200010557600080fd5b5062000221565b8280546200011a90620001bc565b90600052602060002090601f0160209004810192826200013e57600085556200018a565b82601f106200015957805160ff19168380011785556200018a565b828001600101855582156200018a579182015b82811115620001895782518255916020019190600101906200016c565b5b5090506200019991906200019d565b5090565b5b80821115620001b85760008160009055506001016200019e565b5090565b60006002820490506001821680620001d557607f821691505b60208210811415620001ec57620001eb620001f2565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b61249c80620002316000396000f3fe60806040526004361061007b5760003560e01c8063af99c6331161004e578063af99c63314610174578063d614cdb8146101b1578063f2c31ff4146101ef578063fe8c2a6d1461022d5761007b565b80633b3bff0f14610080578063593d6e82146100bd5780637c41ad2c146100fa5780638f8d7f9914610137575b600080fd5b34801561008c57600080fd5b506100a760048036038101906100a2919061179d565b61025d565b6040516100b49190612024565b60405180910390f35b3480156100c957600080fd5b506100e460048036038101906100df919061180a565b610372565b6040516100f19190612024565b60405180910390f35b34801561010657600080fd5b50610121600480360381019061011c919061179d565b61048a565b60405161012e9190612024565b60405180910390f35b34801561014357600080fd5b5061015e600480360381019061015991906117ca565b61059f565b60405161016b9190612068565b60405180910390f35b34801561018057600080fd5b5061019b600480360381019061019691906117ca565b6106b7565b6040516101a89190612068565b60405180910390f35b3480156101bd57600080fd5b506101d860048036038101906101d3919061179d565b6107cf565b6040516101e692919061203f565b60405180910390f35b3480156101fb57600080fd5b50610216600480360381019061021191906117ca565b6108ff565b604051610224929190612083565b60405180910390f35b61024760048036038101906102429190611937565b610a24565b6040516102549190611f72565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff16633b3bff0f60e01b856040516024016102949190611f72565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102fe9190611f5b565b6000604051808303816000865af19150503d806000811461033b576040519150601f19603f3d011682016040523d82523d6000602084013e610340565b606091505b509150915081610351576015610366565b80806020019051810190610365919061184a565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663593d6e8260e01b86866040516024016103ab929190611ffb565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104159190611f5b565b6000604051808303816000865af19150503d8060008114610452576040519150601f19603f3d011682016040523d82523d6000602084013e610457565b606091505b50915091508161046857601561047d565b8080602001905181019061047c919061184a565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b856040516024016104c19190611f72565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161052b9190611f5b565b6000604051808303816000865af19150503d8060008114610568576040519150601f19603f3d011682016040523d82523d6000602084013e61056d565b606091505b50915091508161057e576015610593565b80806020019051810190610592919061184a565b5b60030b92505050919050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16638f8d7f9960e01b86866040516024016105d8929190611f8d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516106429190611f5b565b6000604051808303816000865af19150503d806000811461067f576040519150601f19603f3d011682016040523d82523d6000602084013e610684565b606091505b5091509150816106955760156106aa565b808060200190518101906106a9919061184a565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663af99c63360e01b86866040516024016106f0929190611f8d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161075a9190611f5b565b6000604051808303816000865af19150503d8060008114610797576040519150601f19603f3d011682016040523d82523d6000602084013e61079c565b606091505b5091509150816107ad5760156107c2565b808060200190518101906107c1919061184a565b5b60030b9250505092915050565b60006107d9611448565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663d614cdb860e01b8660405160240161080e9190611f72565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108789190611f5b565b6000604051808303816000865af19150503d80600081146108b5576040519150601f19603f3d011682016040523d82523d6000602084013e6108ba565b606091505b50915091506108c7611448565b826108d4576015816108e9565b818060200190518101906108e891906118f7565b5b8160030b91508095508196505050505050915091565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663f2c31ff460e01b8787604051602401610939929190611f8d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109a39190611f5b565b6000604051808303816000865af19150503d80600081146109e0576040519150601f19603f3d011682016040523d82523d6000602084013e6109e5565b606091505b5091509150816109f85760156000610a0d565b80806020019051810190610a0c91906118b7565b5b8160030b9150809450819550505050509250929050565b600080600167ffffffffffffffff811115610a4257610a416123a9565b5b604051908082528060200260200182016040528015610a7b57816020015b610a6861148b565b815260200190600190039081610a605790505b509050610a9a6000600160405180602001604052806000815250610b82565b81600081518110610aae57610aad61237a565b5b6020026020010181905250610ad581610ac78989610bb9565b610acf610c47565b86610ca3565b91506000610ae38784610e4a565b9050601660030b8114610af557600080fd5b6000610b018785610e4a565b9050601660030b8114610b1357600080fd5b6000610b1f8786610e4a565b9050601660030b8114610b3157600080fd5b6000610b4086888b6001610f62565b9050601660030b8114610b5257600080fd5b6000610b61878b8b6001610f62565b9050601660030b8114610b7357600080fd5b50505050505095945050505050565b610b8a61148b565b6040518060400160405280610b9e86611080565b8152602001610bad858561111e565b81525090509392505050565b6060600167ffffffffffffffff811115610bd657610bd56123a9565b5b604051908082528060200260200182016040528015610c0f57816020015b610bfc6114ab565b815260200190600190039081610bf45790505b5090506000610c1e8484611254565b90508082600081518110610c3557610c3461237a565b5b60200260200101819052505092915050565b6060600067ffffffffffffffff811115610c6457610c636123a9565b5b604051908082528060200260200182016040528015610c9d57816020015b610c8a611510565b815260200190600190039081610c825790505b50905090565b6000610cad611576565b60018054610cba906122e8565b80601f0160208091040260200160405190810160405280929190818152602001828054610ce6906122e8565b8015610d335780601f10610d0857610100808354040283529160200191610d33565b820191906000526020600020905b815481529060010190602001808311610d1657829003601f168201915b5050505050816000018190525060028054610d4d906122e8565b80601f0160208091040260200160405190810160405280929190818152602001828054610d79906122e8565b8015610dc65780601f10610d9b57610100808354040283529160200191610dc6565b820191906000526020600020905b815481529060010190602001808311610da957829003601f168201915b5050505050816020018190525082816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050858160e00181905250600080610e28836004546005548a8a6112c3565b91509150601660030b8214610e3c57600080fd5b809350505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b8686604051602401610e83929190611f8d565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eed9190611f5b565b6000604051808303816000865af19150503d8060008114610f2a576040519150601f19603f3d011682016040523d82523d6000602084013e610f2f565b606091505b509150915081610f40576015610f55565b80806020019051810190610f54919061184a565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b88888888604051602401610f9f9493929190611fb6565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516110099190611f5b565b6000604051808303816000865af19150503d8060008114611046576040519150601f19603f3d011682016040523d82523d6000602084013e61104b565b606091505b50915091508161105c576015611071565b80806020019051810190611070919061184a565b5b60030b92505050949350505050565b6000808260ff1614156110965760019050611119565b60018260ff1614156110ab5760029050611119565b60028260ff1614156110c05760049050611119565b60038260ff1614156110d55760089050611119565b60048260ff1614156110ea5760109050611119565b60058260ff1614156110ff5760209050611119565b60068260ff1614156111145760409050611119565b600090505b919050565b6111266115e5565b60018360ff16141561114857600181600001901515908115158152505061124e565b60028360ff1614156111b15760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505061124d565b60038360ff1614156111cb5781816040018190525061124c565b60048360ff1614156111e55781816060018190525061124b565b60058360ff16141561124a5760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b5b5b5b5b92915050565b61125c6114ab565b82816000019063ffffffff16908163ffffffff1681525050600181604001901515908115158152505081816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505092915050565b6000808660008161010001516000015163ffffffff161480156112f5575060008161010001516040015163ffffffff16145b1561131b576276a7008161010001516040019063ffffffff16908163ffffffff16815250505b60008061016773ffffffffffffffffffffffffffffffffffffffff163463b937581a60e01b8c8c8c8c8c6040516024016113599594939291906120ac565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516113c39190611f5b565b60006040518083038185875af1925050503d8060008114611400576040519150601f19603f3d011682016040523d82523d6000602084013e611405565b606091505b509150915081611418576015600061142d565b8080602001905181019061142c9190611877565b5b8160030b915080955081965050505050509550959350505050565b6040518060600160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600063ffffffff1681525090565b6040518060400160405280600081526020016114a56115e5565b81525090565b6040518060a00160405280600063ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600015158152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518060c00160405280600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600063ffffffff168152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b8152602001600015158152602001606081526020016115df611448565b81525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b600081359050611651816123f3565b92915050565b600081519050611666816123f3565b92915050565b60008151905061167b8161240a565b92915050565b60008151905061169081612421565b92915050565b6000815190506116a581612438565b92915050565b6000606082840312156116c1576116c06123d8565b5b6116cb6060612114565b905060006116db84828501611773565b60008301525060206116ef84828501611642565b602083015250604061170384828501611773565b60408301525092915050565b600060608284031215611725576117246123d8565b5b61172f6060612114565b9050600061173f84828501611788565b600083015250602061175384828501611657565b602083015250604061176784828501611788565b60408301525092915050565b6000813590506117828161244f565b92915050565b6000815190506117978161244f565b92915050565b6000602082840312156117b3576117b26123dd565b5b60006117c184828501611642565b91505092915050565b600080604083850312156117e1576117e06123dd565b5b60006117ef85828601611642565b925050602061180085828601611642565b9150509250929050565b60008060808385031215611821576118206123dd565b5b600061182f85828601611642565b9250506020611840858286016116ab565b9150509250929050565b6000602082840312156118605761185f6123dd565b5b600061186e84828501611696565b91505092915050565b6000806040838503121561188e5761188d6123dd565b5b600061189c85828601611696565b92505060206118ad8582860161166c565b9150509250929050565b600080604083850312156118ce576118cd6123dd565b5b60006118dc85828601611696565b92505060206118ed85828601611681565b9150509250929050565b6000806080838503121561190e5761190d6123dd565b5b600061191c85828601611696565b925050602061192d8582860161170f565b9150509250929050565b600080600080600060a08688031215611953576119526123dd565b5b600061196188828901611773565b955050602061197288828901611642565b945050604061198388828901611642565b935050606061199488828901611642565b92505060806119a588828901611642565b9150509295509295909350565b60006119be8383611cb7565b60a08301905092915050565b60006119d68383611d1f565b60c08301905092915050565b60006119ee8383611ef1565b905092915050565b6119ff81612227565b82525050565b611a0e81612227565b82525050565b6000611a1f82612169565b611a2981856121c7565b9350611a3483612139565b8060005b83811015611a65578151611a4c88826119b2565b9750611a57836121a0565b925050600181019050611a38565b5085935050505092915050565b6000611a7d82612174565b611a8781856121d8565b9350611a9283612149565b8060005b83811015611ac3578151611aaa88826119ca565b9750611ab5836121ad565b925050600181019050611a96565b5085935050505092915050565b6000611adb8261217f565b611ae581856121e9565b935083602082028501611af785612159565b8060005b85811015611b335784840389528151611b1485826119e2565b9450611b1f836121ba565b925060208a01995050600181019050611afb565b50829750879550505050505092915050565b611b4e8161224b565b82525050565b611b5d8161224b565b82525050565b6000611b6e8261218a565b611b7881856121fa565b9350611b888185602086016122b5565b611b91816123e2565b840191505092915050565b6000611ba78261218a565b611bb1818561220b565b9350611bc18185602086016122b5565b80840191505092915050565b611bd681612257565b82525050565b611be58161226e565b82525050565b611bf48161226e565b82525050565b6000611c0582612195565b611c0f8185612216565b9350611c1f8185602086016122b5565b611c28816123e2565b840191505092915050565b606082016000820151611c496000850182611f4c565b506020820151611c5c60208501826119f6565b506040820151611c6f6040850182611f4c565b50505050565b606082016000820151611c8b6000850182611f4c565b506020820151611c9e60208501826119f6565b506040820151611cb16040850182611f4c565b50505050565b60a082016000820151611ccd6000850182611f4c565b506020820151611ce060208501826119f6565b506040820151611cf36040850182611b45565b506060820151611d066060850182611b45565b506080820151611d1960808501826119f6565b50505050565b60c082016000820151611d356000850182611f4c565b506020820151611d486020850182611f4c565b506040820151611d5b6040850182611f4c565b506060820151611d6e6060850182611f4c565b506080820151611d816080850182611b45565b5060a0820151611d9460a08501826119f6565b50505050565b6000610160830160008301518482036000860152611db88282611bfa565b91505060208301518482036020860152611dd28282611bfa565b9150506040830151611de760408601826119f6565b5060608301518482036060860152611dff8282611bfa565b9150506080830151611e146080860182611b45565b5060a0830151611e2760a0860182611bdc565b5060c0830151611e3a60c0860182611b45565b5060e083015184820360e0860152611e528282611ad0565b915050610100830151611e69610100860182611c33565b508091505092915050565b600060a083016000830151611e8c6000860182611b45565b506020830151611e9f60208601826119f6565b5060408301518482036040860152611eb78282611b63565b91505060608301518482036060860152611ed18282611b63565b9150506080830151611ee660808601826119f6565b508091505092915050565b6000604083016000830151611f096000860182611f2e565b5060208301518482036020860152611f218282611e74565b9150508091505092915050565b611f378161229b565b82525050565b611f468161229b565b82525050565b611f55816122a5565b82525050565b6000611f678284611b9c565b915081905092915050565b6000602082019050611f876000830184611a05565b92915050565b6000604082019050611fa26000830185611a05565b611faf6020830184611a05565b9392505050565b6000608082019050611fcb6000830187611a05565b611fd86020830186611a05565b611fe56040830185611a05565b611ff26060830184611beb565b95945050505050565b60006080820190506120106000830185611a05565b61201d6020830184611c75565b9392505050565b60006020820190506120396000830184611bcd565b92915050565b60006080820190506120546000830185611bcd565b6120616020830184611c75565b9392505050565b600060208201905061207d6000830184611beb565b92915050565b60006040820190506120986000830185611beb565b6120a56020830184611b54565b9392505050565b600060a08201905081810360008301526120c68188611d9a565b90506120d56020830187611f3d565b6120e26040830186611f3d565b81810360608301526120f48185611a14565b905081810360808301526121088184611a72565b90509695505050505050565b600061211e61212f565b905061212a828261231a565b919050565b6000604051905090565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b60006122328261227b565b9050919050565b60006122448261227b565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600063ffffffff82169050919050565b60005b838110156122d35780820151818401526020810190506122b8565b838111156122e2576000848401525b50505050565b6000600282049050600182168061230057607f821691505b602082108114156123145761231361234b565b5b50919050565b612323826123e2565b810181811067ffffffffffffffff82111715612342576123416123a9565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b6123fc81612227565b811461240757600080fd5b50565b61241381612239565b811461241e57600080fd5b50565b61242a8161224b565b811461243557600080fd5b50565b61244181612261565b811461244c57600080fd5b50565b612458816122a5565b811461246357600080fd5b5056fea2646970667358221220deae30002bbeb746123bd4dfac93a1d9b56d68c1aec19285d8e50d7d12fd71bc64736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.json
deleted file mode 100644
index e50f6f82df51..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.json
+++ /dev/null
@@ -1,238 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "feeAmount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "firstRecipient",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "secondRecipient",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "createTokenWithHbarsFixedFeeAndTransferIt",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "createdTokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "grantTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "isKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      },
-      {
-        "internalType": "bool",
-        "name": "kycGranted",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "revokeTokenKyc",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "unpauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "uint32",
-            "name": "second",
-            "type": "uint32"
-          },
-          {
-            "internalType": "address",
-            "name": "autoRenewAccount",
-            "type": "address"
-          },
-          {
-            "internalType": "uint32",
-            "name": "autoRenewPeriod",
-            "type": "uint32"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.Expiry",
-        "name": "expiryInfo",
-        "type": "tuple"
-      }
-    ],
-    "name": "updateTokenExpiryInfo",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.bin
deleted file mode 100644
index ea580db6992d..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060018060008060068111156200002d576200002c620001f1565b5b6006811115620000425762000041620001f1565b5b81526020019081526020016000208190555060026001600060016006811115620000715762000070620001f1565b5b6006811115620000865762000085620001f1565b5b81526020019081526020016000208190555060046001600060026006811115620000b557620000b4620001f1565b5b6006811115620000ca57620000c9620001f1565b5b81526020019081526020016000208190555060086001600060036006811115620000f957620000f8620001f1565b5b60068111156200010e576200010d620001f1565b5b815260200190815260200160002081905550601060016000600460068111156200013d576200013c620001f1565b5b6006811115620001525762000151620001f1565b5b81526020019081526020016000208190555060206001600060056006811115620001815762000180620001f1565b5b6006811115620001965762000195620001f1565b5b815260200190815260200160002081905550604060016000600680811115620001c457620001c3620001f1565b5b6006811115620001d957620001d8620001f1565b5b81526020019081526020016000208190555062000220565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b61309580620002306000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c80639b23d3d9116100a2578063df6c06f511610071578063df6c06f51461038b578063eac6f3fe146103bb578063ef7839b6146103eb578063f25b12001461041b578063f848fec41461044b57610116565b80639b23d3d9146102cb578063ac36efb4146102fb578063c76620ca1461032b578063cc2528f01461035b57610116565b80636c40a777116100e95780636c40a777146101db5780636da6b1f01461020b578063842b71db1461023b578063942e01a31461026b578063970e23d21461029b57610116565b806311e1fc071461011b57806315dacbea1461014b5780634ba670351461017b57806358131551146101ab575b600080fd5b610135600480360381019061013091906122b6565b61047b565b6040516101429190612bf4565b60405180910390f35b610165600480360381019061016091906122b6565b610597565b6040516101729190612bf4565b60405180910390f35b6101956004803603810190610190919061224f565b6106b5565b6040516101a29190612bbe565b60405180910390f35b6101c560048036038101906101c0919061247e565b610714565b6040516101d29190612bbe565b60405180910390f35b6101f560048036038101906101f091906122b6565b610771565b6040516102029190612bf4565b60405180910390f35b6102256004803603810190610220919061224f565b610858565b6040516102329190612bbe565b60405180910390f35b610255600480360381019061025091906122b6565b6108b7565b6040516102629190612bf4565b60405180910390f35b61028560048036038101906102809190612370565b61099e565b6040516102929190612bbe565b60405180910390f35b6102b560048036038101906102b09190612563565b6109fb565b6040516102c29190612bbe565b60405180910390f35b6102e560048036038101906102e091906122b6565b610a6c565b6040516102f29190612bf4565b60405180910390f35b61031560048036038101906103109190612563565b610b8a565b6040516103229190612bbe565b60405180910390f35b6103456004803603810190610340919061231d565b610bfb565b6040516103529190612bbe565b60405180910390f35b610375600480360381019061037091906123c3565b610c58565b6040516103829190612bbe565b60405180910390f35b6103a560048036038101906103a09190612370565b610cb7565b6040516103b29190612bbe565b60405180910390f35b6103d560048036038101906103d091906122b6565b610d14565b6040516103e29190612bf4565b60405180910390f35b61040560048036038101906104009190612370565b610e30565b6040516104129190612bbe565b60405180910390f35b6104356004803603810190610430919061231d565b610e8d565b6040516104429190612bbe565b60405180910390f35b61046560048036038101906104609190612370565b610eea565b6040516104729190612bbe565b60405180910390f35b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016104b89493929190612a6c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516105229190612a10565b600060405180830381855af49150503d806000811461055d576040519150601f19603f3d011682016040523d82523d6000602084013e610562565b606091505b509150915081610573576015610588565b808060200190518101906105879190612509565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b888888886040516024016105d49493929190612a6c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161063e9190612a10565b6000604051808303816000865af19150503d806000811461067b576040519150601f19603f3d011682016040523d82523d6000602084013e610680565b606091505b5091509150816106915760156106a6565b808060200190518101906106a59190612509565b5b60030b92505050949350505050565b60006106c385858585610f47565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516106f49190612bbe565b60405180910390a1601660030b811461070c57600080fd5b949350505050565b6000610721848484611065565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516107529190612bbe565b60405180910390a1601660030b811461076a57600080fd5b9392505050565b60003073ffffffffffffffffffffffffffffffffffffffff16639b23d3d9868686866040518563ffffffff1660e01b81526004016107b29493929190612a6c565b602060405180830381600087803b1580156107cc57600080fd5b505af11580156107e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108049190612536565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516108359190612bd9565b60405180910390a1601660030b8160070b1461085057600080fd5b949350505050565b600061086685858585611180565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516108979190612bbe565b60405180910390a1601660030b81146108af57600080fd5b949350505050565b60003073ffffffffffffffffffffffffffffffffffffffff166315dacbea868686866040518563ffffffff1660e01b81526004016108f89493929190612a6c565b602060405180830381600087803b15801561091257600080fd5b505af1158015610926573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061094a9190612536565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa8160405161097b9190612bd9565b60405180910390a1601660030b8160070b1461099657600080fd5b949350505050565b60006109ab84848461129e565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa816040516109dc9190612bbe565b60405180910390a1601660030b81146109f457600080fd5b9392505050565b6000610a1c84610a0a90612f0d565b848490610a179190612ee6565b6113b7565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610a4d9190612bbe565b60405180910390a1601660030b8114610a6557600080fd5b9392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b88888888604051602401610aa99493929190612a6c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610b139190612a10565b6000604051808303816000865af19150503d8060008114610b50576040519150601f19603f3d011682016040523d82523d6000602084013e610b55565b606091505b509150915081610b66576015610b7b565b80806020019051810190610b7a9190612509565b5b60030b92505050949350505050565b6000610bab84610b9990612f0d565b848490610ba69190612ee6565b6114cf565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610bdc9190612bbe565b60405180910390a1601660030b8114610bf457600080fd5b9392505050565b6000610c088484846115e5565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610c399190612bbe565b60405180910390a1601660030b8114610c5157600080fd5b9392505050565b6000610c66858585856116fe565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610c979190612bbe565b60405180910390a1601660030b8114610caf57600080fd5b949350505050565b6000610cc484848461181c565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610cf59190612bbe565b60405180910390a1601660030b8114610d0d57600080fd5b9392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401610d519493929190612a6c565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610dbb9190612a10565b600060405180830381855af49150503d8060008114610df6576040519150601f19603f3d011682016040523d82523d6000602084013e610dfb565b606091505b509150915081610e0c576015610e21565b80806020019051810190610e209190612509565b5b60030b92505050949350505050565b6000610e3d848484611937565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610e6e9190612bbe565b60405180910390a1601660030b8114610e8657600080fd5b9392505050565b6000610e9a848484611a50565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610ecb9190612bbe565b60405180910390a1601660030b8114610ee357600080fd5b9392505050565b6000610ef7848484611b6b565b90507f90a5cf4cffe88b4edbb041cfc7a8a812c48a5ec30b84640fb37690875168e3aa81604051610f289190612bbe565b60405180910390a1601660030b8114610f4057600080fd5b9392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663eca3691760e01b88888888604051602401610f849493929190612a27565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610fee9190612a10565b6000604051808303816000865af19150503d806000811461102b576040519150601f19603f3d011682016040523d82523d6000602084013e611030565b606091505b509150915081611041576015611056565b808060200190518101906110559190612509565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b8787876040516024016110a093929190612b79565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161110a9190612a10565b6000604051808303816000865af19150503d8060008114611147576040519150601f19603f3d011682016040523d82523d6000602084013e61114c565b606091505b50915091508161115d576015611172565b808060200190518101906111719190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016111bd9493929190612a27565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112279190612a10565b6000604051808303816000865af19150503d8060008114611264576040519150601f19603f3d011682016040523d82523d6000602084013e611269565b606091505b50915091508161127a57601561128f565b8080602001905181019061128e9190612509565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637336aaf060e01b8787876040516024016112d993929190612ae8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516113439190612a10565b600060405180830381855af49150503d806000811461137e576040519150601f19603f3d011682016040523d82523d6000602084013e611383565b606091505b5091509150816113945760156113a9565b808060200190518101906113a89190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16630e71804f60e01b86866040516024016113f0929190612c0f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161145a9190612a10565b6000604051808303816000865af19150503d8060008114611497576040519150601f19603f3d011682016040523d82523d6000602084013e61149c565b606091505b5091509150816114ad5760156114c2565b808060200190518101906114c19190612509565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16630e71804f60e01b8686604051602401611508929190612c0f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115729190612a10565b600060405180830381855af49150503d80600081146115ad576040519150601f19603f3d011682016040523d82523d6000602084013e6115b2565b606091505b5091509150816115c35760156115d8565b808060200190518101906115d79190612509565b5b60030b9250505092915050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663367605ca60e01b87878760405160240161162093929190612ab1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161168a9190612a10565b600060405180830381855af49150503d80600081146116c5576040519150601f19603f3d011682016040523d82523d6000602084013e6116ca565b606091505b5091509150816116db5760156116f0565b808060200190518101906116ef9190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b8888888860405160240161173b9493929190612b1f565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516117a59190612a10565b6000604051808303816000865af19150503d80600081146117e2576040519150601f19603f3d011682016040523d82523d6000602084013e6117e7565b606091505b5091509150816117f857601561180d565b8080602001905181019061180c9190612509565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637336aaf060e01b87878760405160240161185793929190612ae8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516118c19190612a10565b6000604051808303816000865af19150503d80600081146118fe576040519150601f19603f3d011682016040523d82523d6000602084013e611903565b606091505b509150915081611914576015611929565b808060200190518101906119289190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b87878760405160240161197293929190612ae8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516119dc9190612a10565b600060405180830381855af49150503d8060008114611a17576040519150601f19603f3d011682016040523d82523d6000602084013e611a1c565b606091505b509150915081611a2d576015611a42565b80806020019051810190611a419190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663367605ca60e01b878787604051602401611a8b93929190612ab1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611af59190612a10565b6000604051808303816000865af19150503d8060008114611b32576040519150601f19603f3d011682016040523d82523d6000602084013e611b37565b606091505b509150915081611b48576015611b5d565b80806020019051810190611b5c9190612509565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff1663e1f21c6760e01b878787604051602401611ba693929190612ae8565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611c109190612a10565b6000604051808303816000865af19150503d8060008114611c4d576040519150601f19603f3d011682016040523d82523d6000602084013e611c52565b606091505b509150915081611c63576015611c78565b80806020019051810190611c779190612509565b5b60030b925050509392505050565b6000611c99611c9484612c6b565b612c46565b90508083825260208201905082856020860282011115611cbc57611cbb612fcc565b5b60005b85811015611cec5781611cd28882611ed4565b845260208401935060208301925050600181019050611cbf565b5050509392505050565b6000611d09611d0484612c97565b612c46565b90508083825260208201905082856020860282011115611d2c57611d2b612fcc565b5b60005b85811015611d5c5781611d428882612021565b845260208401935060208301925050600181019050611d2f565b5050509392505050565b6000611d79611d7484612cc3565b612c46565b90508083825260208201905082856060860282011115611d9c57611d9b612fcc565b5b60005b85811015611dcc5781611db2888261204b565b845260208401935060608301925050600181019050611d9f565b5050509392505050565b6000611de9611de484612cef565b612c46565b90508083825260208201905082856080860282011115611e0c57611e0b612fcc565b5b60005b85811015611e3c5781611e2288826120af565b845260208401935060808301925050600181019050611e0f565b5050509392505050565b6000611e59611e5484612d1b565b612c46565b90508083825260208201905082856020860282011115611e7c57611e7b612fcc565b5b60005b85811015611eca57813567ffffffffffffffff811115611ea257611ea1612fb8565b5b808601611eaf8982612127565b85526020850194506020840193505050600181019050611e7f565b5050509392505050565b600081359050611ee381612fec565b92915050565b600082601f830112611efe57611efd612fb8565b5b8135611f0e848260208601611c86565b91505092915050565b600082601f830112611f2c57611f2b612fb8565b5b8135611f3c848260208601611cf6565b91505092915050565b600082601f830112611f5a57611f59612fb8565b5b8135611f6a848260208601611d66565b91505092915050565b600082601f830112611f8857611f87612fb8565b5b8135611f98848260208601611dd6565b91505092915050565b60008083601f840112611fb757611fb6612fb8565b5b8235905067ffffffffffffffff811115611fd457611fd3612fb3565b5b602083019150836020820283011115611ff057611fef612fcc565b5b9250929050565b60008135905061200681613003565b92915050565b60008151905061201b8161301a565b92915050565b60008135905061203081613031565b92915050565b60008151905061204581613031565b92915050565b60006060828403121561206157612060612fc2565b5b61206b6060612c46565b9050600061207b84828501611ed4565b600083015250602061208f84828501612021565b60208301525060406120a384828501611ff7565b60408301525092915050565b6000608082840312156120c5576120c4612fc2565b5b6120cf6080612c46565b905060006120df84828501611ed4565b60008301525060206120f384828501611ed4565b602083015250604061210784828501612021565b604083015250606061211b84828501611ff7565b60608301525092915050565b60006060828403121561213d5761213c612fc2565b5b6121476060612c46565b9050600061215784828501611ed4565b600083015250602082013567ffffffffffffffff81111561217b5761217a612fc7565b5b61218784828501611f45565b602083015250604082013567ffffffffffffffff8111156121ab576121aa612fc7565b5b6121b784828501611f73565b60408301525092915050565b6000602082840312156121d9576121d8612fbd565b5b81905092915050565b6000602082840312156121f8576121f7612fc2565b5b6122026020612c46565b9050600082013567ffffffffffffffff81111561222257612221612fc7565b5b61222e84828501611f45565b60008301525092915050565b60008135905061224981613048565b92915050565b6000806000806080858703121561226957612268612fd6565b5b600061227787828801611ed4565b945050602061228887828801611ed4565b935050604061229987828801611ed4565b92505060606122aa87828801612021565b91505092959194509250565b600080600080608085870312156122d0576122cf612fd6565b5b60006122de87828801611ed4565b94505060206122ef87828801611ed4565b935050604061230087828801611ed4565b92505060606123118782880161223a565b91505092959194509250565b60008060006060848603121561233657612335612fd6565b5b600061234486828701611ed4565b935050602061235586828701611ed4565b925050604061236686828701611ff7565b9150509250925092565b60008060006060848603121561238957612388612fd6565b5b600061239786828701611ed4565b93505060206123a886828701611ed4565b92505060406123b98682870161223a565b9150509250925092565b600080600080608085870312156123dd576123dc612fd6565b5b60006123eb87828801611ed4565b945050602085013567ffffffffffffffff81111561240c5761240b612fd1565b5b61241887828801611ee9565b935050604085013567ffffffffffffffff81111561243957612438612fd1565b5b61244587828801611ee9565b925050606085013567ffffffffffffffff81111561246657612465612fd1565b5b61247287828801611f17565b91505092959194509250565b60008060006060848603121561249757612496612fd6565b5b60006124a586828701611ed4565b935050602084013567ffffffffffffffff8111156124c6576124c5612fd1565b5b6124d286828701611ee9565b925050604084013567ffffffffffffffff8111156124f3576124f2612fd1565b5b6124ff86828701611f17565b9150509250925092565b60006020828403121561251f5761251e612fd6565b5b600061252d8482850161200c565b91505092915050565b60006020828403121561254c5761254b612fd6565b5b600061255a84828501612036565b91505092915050565b60008060006040848603121561257c5761257b612fd6565b5b600084013567ffffffffffffffff81111561259a57612599612fd1565b5b6125a6868287016121c3565b935050602084013567ffffffffffffffff8111156125c7576125c6612fd1565b5b6125d386828701611fa1565b92509250509250925092565b60006125eb8383612653565b60208301905092915050565b600061260383836128cb565b60208301905092915050565b600061261b83836128e9565b60608301905092915050565b6000612633838361292b565b60808301905092915050565b600061264b8383612980565b905092915050565b61265c81612e7a565b82525050565b61266b81612e7a565b82525050565b600061267c82612d97565b6126868185612e1a565b935061269183612d47565b8060005b838110156126c25781516126a988826125df565b97506126b483612dd9565b925050600181019050612695565b5085935050505092915050565b60006126da82612da2565b6126e48185612e2b565b93506126ef83612d57565b8060005b8381101561272057815161270788826125f7565b975061271283612de6565b9250506001810190506126f3565b5085935050505092915050565b600061273882612dad565b6127428185612e3c565b935061274d83612d67565b8060005b8381101561277e578151612765888261260f565b975061277083612df3565b925050600181019050612751565b5085935050505092915050565b600061279682612db8565b6127a08185612e4d565b93506127ab83612d77565b8060005b838110156127dc5781516127c38882612627565b97506127ce83612e00565b9250506001810190506127af565b5085935050505092915050565b60006127f482612dc3565b6127fe8185612e5e565b93508360208202850161281085612d87565b8060005b8581101561284c578484038952815161282d858261263f565b945061283883612e0d565b925060208a01995050600181019050612814565b50829750879550505050505092915050565b61286781612e8c565b82525050565b61287681612e8c565b82525050565b600061288782612dce565b6128918185612e6f565b93506128a1818560208601612f20565b80840191505092915050565b6128b681612e98565b82525050565b6128c581612efb565b82525050565b6128d481612eaf565b82525050565b6128e381612eaf565b82525050565b6060820160008201516128ff6000850182612653565b50602082015161291260208501826128cb565b506040820151612925604085018261285e565b50505050565b6080820160008201516129416000850182612653565b5060208201516129546020850182612653565b50604082015161296760408501826128cb565b50606082015161297a606085018261285e565b50505050565b60006060830160008301516129986000860182612653565b50602083015184820360208601526129b0828261272d565b915050604083015184820360408601526129ca828261278b565b9150508091505092915050565b600060208301600083015184820360008601526129f4828261272d565b9150508091505092915050565b612a0a81612edc565b82525050565b6000612a1c828461287c565b915081905092915050565b6000608082019050612a3c6000830187612662565b612a496020830186612662565b612a566040830185612662565b612a6360608301846128da565b95945050505050565b6000608082019050612a816000830187612662565b612a8e6020830186612662565b612a9b6040830185612662565b612aa86060830184612a01565b95945050505050565b6000606082019050612ac66000830186612662565b612ad36020830185612662565b612ae0604083018461286d565b949350505050565b6000606082019050612afd6000830186612662565b612b0a6020830185612662565b612b176040830184612a01565b949350505050565b6000608082019050612b346000830187612662565b8181036020830152612b468186612671565b90508181036040830152612b5a8185612671565b90508181036060830152612b6e81846126cf565b905095945050505050565b6000606082019050612b8e6000830186612662565b8181036020830152612ba08185612671565b90508181036040830152612bb481846126cf565b9050949350505050565b6000602082019050612bd360008301846128ad565b92915050565b6000602082019050612bee60008301846128bc565b92915050565b6000602082019050612c0960008301846128da565b92915050565b60006040820190508181036000830152612c2981856129d7565b90508181036020830152612c3d81846127e9565b90509392505050565b6000612c50612c61565b9050612c5c8282612f53565b919050565b6000604051905090565b600067ffffffffffffffff821115612c8657612c85612f84565b5b602082029050602081019050919050565b600067ffffffffffffffff821115612cb257612cb1612f84565b5b602082029050602081019050919050565b600067ffffffffffffffff821115612cde57612cdd612f84565b5b602082029050602081019050919050565b600067ffffffffffffffff821115612d0a57612d09612f84565b5b602082029050602081019050919050565b600067ffffffffffffffff821115612d3657612d35612f84565b5b602082029050602081019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b6000612e8582612ebc565b9050919050565b60008115159050919050565b6000819050919050565b60008160030b9050919050565b60008160070b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000612ef3368484611e46565b905092915050565b6000612f0682612eaf565b9050919050565b6000612f1936836121e2565b9050919050565b60005b83811015612f3e578082015181840152602081019050612f23565b83811115612f4d576000848401525b50505050565b612f5c82612fdb565b810181811067ffffffffffffffff82111715612f7b57612f7a612f84565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b612ff581612e7a565b811461300057600080fd5b50565b61300c81612e8c565b811461301757600080fd5b50565b61302381612ea2565b811461302e57600080fd5b50565b61303a81612eaf565b811461304557600080fd5b50565b61305181612edc565b811461305c57600080fd5b5056fea2646970667358221220fb5bdca62dcc8c5ccb736a556af10d4e4b8e4eb43dd22274e1beefb11f5a0b1664736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.json
deleted file mode 100644
index 87d39e838d78..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.json
+++ /dev/null
@@ -1,732 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "name": "ResponseCode",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "approved",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "approveNFTPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "approvePublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TransferList",
-        "name": "transferList",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransferList",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "cryptoTransferPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "approved",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateApproveNFTPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateApprovePublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TransferList",
-        "name": "transferList",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "token",
-            "type": "address"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "accountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "amount",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.AccountAmount[]",
-            "name": "transfers",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "receiverAccountID",
-                "type": "address"
-              },
-              {
-                "internalType": "int64",
-                "name": "serialNumber",
-                "type": "int64"
-              },
-              {
-                "internalType": "bool",
-                "name": "isApproval",
-                "type": "bool"
-              }
-            ],
-            "internalType": "struct IHederaTokenService.NftTransfer[]",
-            "name": "nftTransfers",
-            "type": "tuple[]"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.TokenTransferList[]",
-        "name": "tokenTransferList",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "delegateCryptoTransferPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "delegateSetApprovalForAllPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "setApprovalForAllPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFTPublic",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromPublic",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      }
-    ],
-    "name": "transferNFTPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "sender",
-        "type": "address[]"
-      },
-      {
-        "internalType": "address[]",
-        "name": "receiver",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumber",
-        "type": "int64[]"
-      }
-    ],
-    "name": "transferNFTsPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "transferTokenPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "accountId",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "amount",
-        "type": "int64[]"
-      }
-    ],
-    "name": "transferTokensPublic",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.bin
deleted file mode 100644
index 0cba0c8be9ec..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526103ad806100136000396000f3fe6080604052600436106100435760003560e01c806310c7cf9a1461004f578063bf53512514610078578063c306f9b114610096578063db8a5bf6146100bf5761004a565b3661004a57005b600080fd5b34801561005b57600080fd5b506100766004803603810190610071919061027e565b6100ea565b005b610080610161565b60405161008d91906102cd565b60405180910390f35b3480156100a257600080fd5b506100bd60048036038101906100b8919061027e565b610169565b005b3480156100cb57600080fd5b506100d46101e0565b6040516100e19190610303565b60405180910390f35b8173ffffffffffffffffffffffffffffffffffffffff1663598fdeb8826040518263ffffffff1660e01b815260040160206040518083038185885af1158015610137573d6000803e3d6000fd5b50505050506040513d601f19601f8201168201806040525081019061015c919061034a565b505050565b600034905090565b8173ffffffffffffffffffffffffffffffffffffffff1663598fdeb8826040518263ffffffff1660e01b815260040160206040518083038185885af11580156101b6573d6000803e3d6000fd5b50505050506040513d601f19601f820116820180604052508101906101db919061034a565b505050565b600090565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610215826101ea565b9050919050565b6102258161020a565b811461023057600080fd5b50565b6000813590506102428161021c565b92915050565b6000819050919050565b61025b81610248565b811461026657600080fd5b50565b60008135905061027881610252565b92915050565b60008060408385031215610295576102946101e5565b5b60006102a385828601610233565b92505060206102b485828601610269565b9150509250929050565b6102c781610248565b82525050565b60006020820190506102e260008301846102be565b92915050565b60008115159050919050565b6102fd816102e8565b82525050565b600060208201905061031860008301846102f4565b92915050565b610327816102e8565b811461033257600080fd5b50565b6000815190506103448161031e565b92915050565b6000602082840312156103605761035f6101e5565b5b600061036e84828501610335565b9150509291505056fea26469706673582212205e4ba5e69f834cf9c74d6a258a064de5e58bf53ad190dd1d8a1b0e3b530151b264736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.json
deleted file mode 100644
index 0349b990bbc7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.json
+++ /dev/null
@@ -1,73 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contract",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "subLevelNonPayableCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contract",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "subLevelPayableCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "topLevelNonPayableCall",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "topLevelTransferCall",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "receive"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.bin
deleted file mode 100644
index 4d574bb6a286..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061021a806100206000396000f3fe6080604052600436106100225760003560e01c8063f3eca8aa1461002e57610029565b3661002957005b600080fd5b6100486004803603810190610043919061013a565b61004a565b005b6000341161008d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610084906101c4565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156100d3573d6000803e3d6000fd5b5050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610107826100dc565b9050919050565b610117816100fc565b811461012257600080fd5b50565b6000813590506101348161010e565b92915050565b6000602082840312156101505761014f6100d7565b5b600061015e84828501610125565b91505092915050565b600082825260208201905092915050565b7f416d6f756e74206d7573742062652067726561746572207468616e2030000000600082015250565b60006101ae601d83610167565b91506101b982610178565b602082019050919050565b600060208201905081810360008301526101dd816101a1565b905091905056fea2646970667358221220f9886985282fa21e7346c7994ee60f86afd9e9196cc7b132acace345af930a9164736f6c63430008100033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.json
deleted file mode 100644
index 9a0c5fe17f93..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[{"internalType":"address payable","name":"Address","type":"address"}],"name":"touchAccount","outputs":[],"stateMutability":"payable","type":"function"},{"stateMutability":"payable","type":"receive"}]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.bin
deleted file mode 100644
index b3f2dd4d66bf..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610178806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c6dad08214610030575b600080fd5b61003861004e565b60405161004591906100cb565b60405180910390f35b600060405161005c9061007e565b604051809103906000f080158015610078573d6000803e3d6000fd5b50905090565b605c806100e783390190565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100b58261008a565b9050919050565b6100c5816100aa565b82525050565b60006020820190506100e060008301846100bc565b9291505056fe6080604052348015600f57600080fd5b50603f80601d6000396000f3fe6080604052600080fdfea26469706673582212205c83b99cd428e6cd79dda61dbf3fa05ca4e722a7f7c7e1c2ebcd49a82e15d81564736f6c634300080c0033a2646970667358221220a523f24fcb09c5eb72ea1c0f8c70d31e4175d77807b1ff963ddb38cca881d45c64736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.json
deleted file mode 100644
index 0f2a6e5836e5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "make",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.bin
deleted file mode 100644
index 9a76a807273a..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516200253e3803806200253e83398101604081905261003191610042565b600092909255600155600255610070565b60008060006060848603121561005757600080fd5b8351925060208401519150604084015190509250925092565b6124be80620000806000396000f3fe608060405234801561001057600080fd5b50600436106101f05760003560e01c80636c190cd11161010f578063c57858e8116100a2578063df0c238911610071578063df0c2389146103d7578063ed22ad94146103ea578063efa65bb2146103fd578063f789312f1461041057600080fd5b8063c57858e8146103a1578063c9ae5e0c146103b4578063cb666bdc146103bc578063cda7be61146103cf57600080fd5b8063af626f21116100de578063af626f2114610360578063b12c8c3a14610373578063b3211e5a1461037b578063be4f19f01461038e57600080fd5b80636c190cd114610311578063713ba21b146103275780637fdb6cb11461033a5780639fb677041461034d57600080fd5b8063559e9ec8116101875780635f69e53b116101565780635f69e53b146102c557806360b2981e146102d857806365f6fc65146102eb578063687b0924146102fe57600080fd5b8063559e9ec8146102845780635c4dce0c146102975780635e6c16111461029f5780635e8ad6c7146102b257600080fd5b80632ae8ddb6116101c35780632ae8ddb61461023857806331b1424e1461024b578063384fc2a31461025e5780633fb7965b1461027157600080fd5b80630bec5fbb146101f55780630f70c4511461020a5780631724389f1461021d578063173eef7314610225575b600080fd5b6102086102033660046122bb565b610423565b005b6102086102183660046122dd565b6104a7565b61020861086f565b6102086102333660046122bb565b61092b565b6102086102463660046122bb565b6109a4565b6102086102593660046122bb565b6109e2565b61020861026c3660046122dd565b610a5d565b61020861027f366004612310565b610c77565b6102086102923660046122dd565b610d06565b610208610f3e565b6102086102ad3660046122dd565b61107d565b6102086102c036600461233a565b600155565b6102086102d33660046122bb565b611299565b6102086102e6366004612310565b6112d7565b6102086102f93660046122bb565b611329565b61020861030c3660046122dd565b611367565b6002545b60405190815260200160405180910390f35b61020861033536600461233a565b600255565b6102086103483660046122dd565b61162e565b61020861035b3660046122bb565b6118b6565b61020861036e366004612310565b6118f4565b610208611946565b610208610389366004612310565b611a85565b61020861039c36600461233a565b600055565b6102086103af3660046122dd565b611ad7565b600054610315565b6102086103ca366004612310565b611d25565b600154610315565b6102086103e53660046122dd565b611d77565b6102086103f8366004612310565b612035565b61020861040b3660046122dd565b612087565b61020861041e3660046122bb565b612261565b60408051600481526024810182526020810180516001600160e01b031663326b978360e21b17905290516001600160a01b0383169161046191612353565b600060405180830381855afa9150503d806000811461049c576040519150601f19603f3d011682016040523d82523d6000602084013e6104a1565b606091505b50505050565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156104e7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050b919061238e565b50604051635e8ad6c760e01b815261d7d460048201523090635e8ad6c790602401600060405180830381600087803b15801561054657600080fd5b505af115801561055a573d6000803e3d6000fd5b50506040516327ed9dc160e21b81526001600160a01b0384166004820152309250639fb677049150602401600060405180830381600087803b15801561059f57600080fd5b505af11580156105b3573d6000803e3d6000fd5b5050604051633b48ab6560e21b81526001600160a01b038416600482015261020c602482015230925063ed22ad949150604401600060405180830381600087803b15801561060057600080fd5b505af1158015610614573d6000803e3d6000fd5b50506040516001600160a01b03848116602483015285169250604401905060408051601f198184030181529181526020820180516001600160e01b0316635f69e53b60e01b179052516106679190612353565b600060405180830381855af49150503d80600081146106a2576040519150601f19603f3d011682016040523d82523d6000602084013e6106a7565b606091505b50506040516001600160a01b038381166024830152603660448301528416915060640160408051601f198184030181529181526020820180516001600160e01b0316633fb7965b60e01b179052516106ff9190612353565b600060405180830381855af49150503d806000811461073a576040519150601f19603f3d011682016040523d82523d6000602084013e61073f565b606091505b50506040516001600160a01b0383811660248301528416915060440160408051601f198184030181529181526020820180516001600160e01b03166318d8a12760e11b179052516107909190612353565b600060405180830381855af49150503d80600081146107cb576040519150601f19603f3d011682016040523d82523d6000602084013e6107d0565b606091505b50506040516001600160a01b038381166024830152600060448301528416915060640160408051601f198184030181529181526020820180516001600160e01b031663af626f2160e01b179052516108289190612353565b600060405180830381855af49150503d8060008114610863576040519150601f19603f3d011682016040523d82523d6000602084013e610868565b606091505b5050505050565b306001600160a01b0316636c190cd16040518163ffffffff1660e01b81526004016020604051808303816000875af11580156108af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d3919061238e565b5060405163713ba21b60e01b8152600a6004820152309063713ba21b906024015b600060405180830381600087803b15801561090e57600080fd5b505af1158015610922573d6000803e3d6000fd5b50505050600080fd5b60408051600481526024810182526020810180516001600160e01b031663cda7be6160e01b17905290516001600160a01b0383169161096991612353565b600060405180830381855af49150503d806000811461049c576040519150601f19603f3d011682016040523d82523d6000602084013e6104a1565b60408051600481526024810182526020810180516001600160e01b031663cda7be6160e01b17905290516001600160a01b0383169161046191612353565b60408051600481526024810182526020810180516001600160e01b031663cda7be6160e01b17905290516001600160a01b03831691610a2091612353565b6000604051808303816000865af19150503d806000811461049c576040519150601f19603f3d011682016040523d82523d6000602084013e6104a1565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610a9d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac1919061238e565b50604051630be4f19f60e41b815260036004820152309063be4f19f090602401600060405180830381600087803b158015610afb57600080fd5b505af1158015610b0f573d6000803e3d6000fd5b50505050306001600160a01b031663cda7be616040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610b53573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b77919061238e565b50604051635e8ad6c760e01b81526004808201523090635e8ad6c790602401600060405180830381600087803b158015610bb057600080fd5b505af1158015610bc4573d6000803e3d6000fd5b50506040516327ed9dc160e21b81526001600160a01b0385166004820152309250639fb677049150602401600060405180830381600087803b158015610c0957600080fd5b505af1158015610c1d573d6000803e3d6000fd5b50506040516001600160a01b0384811660248301526037604483015285169250606401905060408051601f198184030181529181526020820180516001600160e01b03166330594c0f60e11b179052516108289190612353565b816001600160a01b031681604051602401610c9491815260200190565b60408051601f198184030181529181526020820180516001600160e01b0316630be4f19f60e41b17905251610cc99190612353565b6000604051808303816000865af19150503d8060008114610863576040519150601f19603f3d011682016040523d82523d6000602084013e610868565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610d46573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d6a919061238e565b50604051635e8ad6c760e01b815261d7d460048201523090635e8ad6c790602401600060405180830381600087803b158015610da557600080fd5b505af1158015610db9573d6000803e3d6000fd5b505050506000829050806001600160a01b0316636c190cd16040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610e02573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e26919061238e565b5060405163713ba21b60e01b815261020c60048201526001600160a01b0382169063713ba21b90602401600060405180830381600087803b158015610e6a57600080fd5b505af1158015610e7e573d6000803e3d6000fd5b5050604051630bec5fbb60e01b81526001600160a01b03858116600483015284169250630bec5fbb9150602401600060405180830381600087803b158015610ec557600080fd5b505af1158015610ed9573d6000803e3d6000fd5b50506040516315746edb60e11b81526001600160a01b03858116600483015284169250632ae8ddb691506024015b600060405180830381600087803b158015610f2157600080fd5b505af1158015610f35573d6000803e3d6000fd5b50505050505050565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610f7e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fa2919061238e565b50604051630be4f19f60e41b815260376004820152309063be4f19f090602401600060405180830381600087803b158015610fdc57600080fd5b505af1158015610ff0573d6000803e3d6000fd5b50505050306001600160a01b031663cda7be616040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611034573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611058919061238e565b50604051635e8ad6c760e01b8152609b60048201523090635e8ad6c7906024016108f4565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156110bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110e1919061238e565b50604051635e8ad6c760e01b81526004808201523090635e8ad6c790602401600060405180830381600087803b15801561111a57600080fd5b505af115801561112e573d6000803e3d6000fd5b505060405163f789312f60e01b81526001600160a01b038516600482015230925063f789312f9150602401600060405180830381600087803b15801561117357600080fd5b505af1158015611187573d6000803e3d6000fd5b50506040516332d99af760e21b81526001600160a01b03851660048201526005602482015230925063cb666bdc9150604401600060405180830381600087803b1580156111d357600080fd5b505af11580156111e7573d6000803e3d6000fd5b505050506000819050806001600160a01b031663b12c8c3a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561122b57600080fd5b505af192505050801561123c575060015b611294576112486123a7565b806308c379a01415611268575061125d6123fe565b806104a1575061126a565b505b3d808015610863576040519150601f19603f3d011682016040523d82523d6000602084013e610868565b505050565b60408051600481526024810182526020810180516001600160e01b031663326b978360e21b17905290516001600160a01b03831691610a2091612353565b816001600160a01b0316816040516024016112f491815260200190565b60408051601f198184030181529181526020820180516001600160e01b0316630be4f19f60e41b179052516108289190612353565b60408051600481526024810182526020810180516001600160e01b031663326b978360e21b17905290516001600160a01b0383169161096991612353565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156113a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113cb919061238e565b50604051635e8ad6c760e01b8152603760048201523090635e8ad6c790602401600060405180830381600087803b15801561140557600080fd5b505af1158015611419573d6000803e3d6000fd5b505050506000829050806001600160a01b0316636c190cd16040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611462573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611486919061238e565b5060405163713ba21b60e01b8152608f60048201526001600160a01b0382169063713ba21b90602401600060405180830381600087803b1580156114c957600080fd5b505af11580156114dd573d6000803e3d6000fd5b5050604051635f69e53b60e01b81526001600160a01b03858116600483015284169250635f69e53b9150602401600060405180830381600087803b15801561152457600080fd5b505af1158015611538573d6000803e3d6000fd5b5050604051633fb7965b60e01b81526001600160a01b0385811660048301526000602483015284169250633fb7965b9150604401600060405180830381600087803b15801561158657600080fd5b505af115801561159a573d6000803e3d6000fd5b50506040516318d8a12760e11b81526001600160a01b038581166004830152841692506331b1424e9150602401600060405180830381600087803b1580156115e157600080fd5b505af11580156115f5573d6000803e3d6000fd5b505060405163af626f2160e01b81526001600160a01b038581166004830152600060248301528416925063af626f219150604401610f07565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af115801561166e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611692919061238e565b50604051635e8ad6c760e01b81526004808201523090635e8ad6c790602401600060405180830381600087803b1580156116cb57600080fd5b505af11580156116df573d6000803e3d6000fd5b50505050816001600160a01b031660405161171d907f72656164416e6457726974655468656e52657665727428290000000000000000815260180190565b600060405180830381855af49150503d8060008114611758576040519150601f19603f3d011682016040523d82523d6000602084013e61175d565b606091505b5050506000819050806001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156117a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117c9919061238e565b50604051630be4f19f60e41b8152607b60048201526001600160a01b0382169063be4f19f090602401600060405180830381600087803b15801561180c57600080fd5b505af1158015611820573d6000803e3d6000fd5b50505050806001600160a01b031663cda7be616040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611864573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611888919061238e565b50604051635e8ad6c760e01b8152600060048201526001600160a01b03821690635e8ad6c790602401610f07565b60408051600481526024810182526020810180516001600160e01b0316636c190cd160e01b17905290516001600160a01b0383169161096991612353565b816001600160a01b03168160405160240161191191815260200190565b60408051601f198184030181529181526020820180516001600160e01b0316635e8ad6c760e01b17905251610cc99190612353565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611986573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119aa919061238e565b50604051630be4f19f60e41b8152600c6004820152309063be4f19f090602401600060405180830381600087803b1580156119e457600080fd5b505af11580156119f8573d6000803e3d6000fd5b50505050306001600160a01b031663cda7be616040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a60919061238e565b50604051635e8ad6c760e01b8152600060048201523090635e8ad6c7906024016108f4565b816001600160a01b031681604051602401611aa291815260200190565b60408051601f198184030181529181526020820180516001600160e01b0316635e8ad6c760e01b179052516108289190612353565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611b17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b3b919061238e565b50604051635e8ad6c760e01b81526004808201523090635e8ad6c790602401600060405180830381600087803b158015611b7457600080fd5b505af1158015611b88573d6000803e3d6000fd5b50506040516327ed9dc160e21b81526001600160a01b0385166004820152309250639fb677049150602401600060405180830381600087803b158015611bcd57600080fd5b505af1158015611be1573d6000803e3d6000fd5b5050604051633b48ab6560e21b81526001600160a01b03851660048201526005602482015230925063ed22ad949150604401600060405180830381600087803b158015611c2d57600080fd5b505af1158015611c41573d6000803e3d6000fd5b50506040516001600160a01b03848116602483015285169250604401905060408051601f198184030181529181526020820180516001600160e01b0316630bec5fbb60e01b17905251611c949190612353565b600060405180830381855af49150503d8060008114611ccf576040519150601f19603f3d011682016040523d82523d6000602084013e611cd4565b606091505b50506040516001600160a01b0383811660248301528416915060440160408051601f198184030181529181526020820180516001600160e01b03166315746edb60e11b179052516108289190612353565b816001600160a01b031681604051602401611d4291815260200190565b60408051601f198184030181529181526020820180516001600160e01b031663713ba21b60e01b17905251610cc99190612353565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611db7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ddb919061238e565b50604051635e8ad6c760e01b8152603760048201523090635e8ad6c790602401600060405180830381600087803b158015611e1557600080fd5b505af1158015611e29573d6000803e3d6000fd5b505060405163f789312f60e01b81526001600160a01b038516600482015230925063f789312f9150602401600060405180830381600087803b158015611e6e57600080fd5b505af1158015611e82573d6000803e3d6000fd5b50506040516332d99af760e21b81526001600160a01b0385166004820152608f602482015230925063cb666bdc9150604401600060405180830381600087803b158015611ece57600080fd5b505af1158015611ee2573d6000803e3d6000fd5b50506040516365f6fc6560e01b81526001600160a01b038481166004830152859350831691506365f6fc6590602401600060405180830381600087803b158015611f2b57600080fd5b505af1158015611f3f573d6000803e3d6000fd5b50506040516330594c0f60e11b81526001600160a01b03858116600483015260646024830152841692506360b2981e9150604401600060405180830381600087803b158015611f8d57600080fd5b505af1158015611fa1573d6000803e3d6000fd5b505060405163173eef7360e01b81526001600160a01b0385811660048301528416925063173eef739150602401600060405180830381600087803b158015611fe857600080fd5b505af1158015611ffc573d6000803e3d6000fd5b50506040516359908f2d60e11b81526001600160a01b038581166004830152600060248301528416925063b3211e5a9150604401610f07565b816001600160a01b03168160405160240161205291815260200190565b60408051601f198184030181529181526020820180516001600160e01b031663713ba21b60e01b179052516108289190612353565b306001600160a01b031663c9ae5e0c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156120c7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120eb919061238e565b50604051635e8ad6c760e01b815261d7d460048201523090635e8ad6c790602401600060405180830381600087803b15801561212657600080fd5b505af115801561213a573d6000803e3d6000fd5b505050506000829050806001600160a01b0316636c190cd16040518163ffffffff1660e01b81526004016020604051808303816000875af1158015612183573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121a7919061238e565b5060405163713ba21b60e01b815261020c60048201526001600160a01b0382169063713ba21b90602401600060405180830381600087803b1580156121eb57600080fd5b505af11580156121ff573d6000803e3d6000fd5b505050506000829050806001600160a01b0316635c4dce0c6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561224357600080fd5b505af1158015612257573d6000803e3d6000fd5b5050505050505050565b60408051600481526024810182526020810180516001600160e01b0316636c190cd160e01b17905290516001600160a01b03831691610a2091612353565b80356001600160a01b03811681146122b657600080fd5b919050565b6000602082840312156122cd57600080fd5b6122d68261229f565b9392505050565b600080604083850312156122f057600080fd5b6122f98361229f565b91506123076020840161229f565b90509250929050565b6000806040838503121561232357600080fd5b61232c8361229f565b946020939093013593505050565b60006020828403121561234c57600080fd5b5035919050565b6000825160005b81811015612374576020818601810151858301520161235a565b81811115612383576000828501525b509190910192915050565b6000602082840312156123a057600080fd5b5051919050565b600060033d11156123c05760046000803e5060005160e01c5b90565b601f8201601f1916810167ffffffffffffffff811182821017156123f757634e487b7160e01b600052604160045260246000fd5b6040525050565b600060443d101561240c5790565b6040516003193d81016004833e81513d67ffffffffffffffff816024840111818411171561243c57505050505090565b82850191508151818111156124545750505050505090565b843d870101602082850101111561246e5750505050505090565b61247d602082860101876123c3565b50909594505050505056fea26469706673582212201b36cfabae90fe0267fab84c009abc60bb603509ef10f48692188eff39f8ff6e64736f6c634300080b0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.json
deleted file mode 100644
index e32dee726230..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.json
+++ /dev/null
@@ -1,496 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_slot0",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_slot1",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_slot2",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callAddressGetSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callAddressGetSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callAddressGetSlot2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callAddressSetSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callAddressSetSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callAddressSetSlot2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "callToContractCForE2EScenario92",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCallAddressGetSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCallAddressGetSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "delegateCallAddressGetSlot2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateCallAddressSetSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateCallAddressSetSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateCallAddressSetSlot2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario10",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario11",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario3",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario4",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario5",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario6",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario9",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "failingGettingAndSetting",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getSlot0",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getSlot1",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getSlot2",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "readAndWriteThenRevert",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_slot0",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_slot1",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_slot2",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot2",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "staticCallAddressGetSlot0",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "staticCallAddressGetSlot1",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.bin
deleted file mode 100644
index 96af76248084..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516060806115e68339810180604052810190808051906020019092919080519060200190929190805190602001909291905050508260008190555081600181905550806002819055505050506115788061006e6000396000f3006080604052600436106100d0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630f0f837a146100d55780634dd7d818146101225780635e8ad6c7146101855780636c190cd1146101b25780636e48f264146101dd578063713ba21b146102205780639c9e949b1461024d578063b07eb76914610290578063be4f19f0146102dd578063c9ae5e0c1461030a578063cda7be6114610335578063dffcda6a14610360578063e659e332146103ad578063fda1498c14610410575b600080fd5b3480156100e157600080fd5b50610120600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610453565b005b34801561012e57600080fd5b50610183600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061056c565b005b34801561019157600080fd5b506101b060048036038101908080359060200190929190505050610aa6565b005b3480156101be57600080fd5b506101c7610ab0565b6040518082815260200191505060405180910390f35b3480156101e957600080fd5b5061021e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610aba565b005b34801561022c57600080fd5b5061024b60048036038101908080359060200190929190505050610bc7565b005b34801561025957600080fd5b5061028e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610bd1565b005b34801561029c57600080fd5b506102db600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610cde565b005b3480156102e957600080fd5b5061030860048036038101908080359060200190929190505050610df7565b005b34801561031657600080fd5b5061031f610e01565b6040518082815260200191505060405180910390f35b34801561034157600080fd5b5061034a610e0a565b6040518082815260200191505060405180910390f35b34801561036c57600080fd5b506103ab600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610e14565b005b3480156103b957600080fd5b5061040e600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f2d565b005b34801561041c57600080fd5b50610451600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061143f565b005b8173ffffffffffffffffffffffffffffffffffffffff1681604051602401808281526020019150506040516020818303038152906040527f5e8ad6c7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b8381101561052557808201518184015260208101905061050a565b50505050905090810190601f1680156105525780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af2915050505050565b60003073ffffffffffffffffffffffffffffffffffffffff1663c9ae5e0c6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1580156105d257600080fd5b505af11580156105e6573d6000803e3d6000fd5b505050506040513d60208110156105fc57600080fd5b8101908080519060200190929190505050503073ffffffffffffffffffffffffffffffffffffffff16635e8ad6c761d7d46040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561067f57600080fd5b505af1158015610693573d6000803e3d6000fd5b505050508290508073ffffffffffffffffffffffffffffffffffffffff16636c190cd16040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1580156106fe57600080fd5b505af1158015610712573d6000803e3d6000fd5b505050506040513d602081101561072857600080fd5b8101908080519060200190929190505050508073ffffffffffffffffffffffffffffffffffffffff1663713ba21b61020c6040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b1580156107ab57600080fd5b505af11580156107bf573d6000803e3d6000fd5b505050508073ffffffffffffffffffffffffffffffffffffffff1663fda1498c836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b15801561085e57600080fd5b505af1158015610872573d6000803e3d6000fd5b505050508073ffffffffffffffffffffffffffffffffffffffff1663dffcda6a8360366040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b15801561091a57600080fd5b505af115801561092e573d6000803e3d6000fd5b505050508073ffffffffffffffffffffffffffffffffffffffff16636e48f264836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b1580156109cd57600080fd5b505af11580156109e1573d6000803e3d6000fd5b505050508073ffffffffffffffffffffffffffffffffffffffff16630f0f837a8360006040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b158015610a8957600080fd5b505af1158015610a9d573d6000803e3d6000fd5b50505050505050565b8060018190555050565b6000600254905090565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fcda7be61000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b83811015610b81578082015181840152602081019050610b66565b50505050905090810190601f168015610bae5780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af29150505050565b8060028190555050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f6c190cd1000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b83811015610c98578082015181840152602081019050610c7d565b50505050905090810190601f168015610cc55780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af29150505050565b8173ffffffffffffffffffffffffffffffffffffffff1681604051602401808281526020019150506040516020818303038152906040527f713ba21b000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b83811015610db0578082015181840152602081019050610d95565b50505050905090810190601f168015610ddd5780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af2915050505050565b8060008190555050565b60008054905090565b6000600154905090565b8173ffffffffffffffffffffffffffffffffffffffff1681604051602401808281526020019150506040516020818303038152906040527fbe4f19f0000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b83811015610ee6578082015181840152602081019050610ecb565b50505050905090810190601f168015610f135780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af2915050505050565b3073ffffffffffffffffffffffffffffffffffffffff1663c9ae5e0c6040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b158015610f9157600080fd5b505af1158015610fa5573d6000803e3d6000fd5b505050506040513d6020811015610fbb57600080fd5b8101908080519060200190929190505050503073ffffffffffffffffffffffffffffffffffffffff1663be4f19f060026040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561103d57600080fd5b505af1158015611051573d6000803e3d6000fd5b505050503073ffffffffffffffffffffffffffffffffffffffff1663cda7be616040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b1580156110b957600080fd5b505af11580156110cd573d6000803e3d6000fd5b505050506040513d60208110156110e357600080fd5b8101908080519060200190929190505050503073ffffffffffffffffffffffffffffffffffffffff16635e8ad6c761d7d46040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180828152602001915050600060405180830381600087803b15801561116657600080fd5b505af115801561117a573d6000803e3d6000fd5b505050503073ffffffffffffffffffffffffffffffffffffffff16639c9e949b836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b15801561121957600080fd5b505af115801561122d573d6000803e3d6000fd5b505050503073ffffffffffffffffffffffffffffffffffffffff1663b07eb7698361020c6040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182815260200192505050600060405180830381600087803b1580156112d657600080fd5b505af11580156112ea573d6000803e3d6000fd5b505050508173ffffffffffffffffffffffffffffffffffffffff16816037604051602401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018260ff168152602001925050506040516020818303038152906040527fdffcda6a000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b838110156113f85780820151818401526020810190506113dd565b50505050905090810190601f1680156114255780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af2915050505050565b8073ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527fc9ae5e0c000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405180828051906020019080838360005b838110156115065780820151818401526020810190506114eb565b50505050905090810190601f1680156115335780820380516001836020036101000a031916815260200191505b509150506000604051808303816000865af291505050505600a165627a7a7230582013ac7be6250640cce01030675a941f3789f3e6e1f727ab6b3ff5394d1d8b671c0029
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.json
deleted file mode 100644
index fe42d14d11af..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.json
+++ /dev/null
@@ -1,237 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callcodeAddressSetSlot1",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario7",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_slot1",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot1",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "getSlot2",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callcodeAddressGetSlot1",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_slot2",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot2",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callcodeAddressGetSlot2",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callcodeAddressSetSlot2",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_slot0",
-        "type": "uint256"
-      }
-    ],
-    "name": "setSlot0",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "getSlot0",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [],
-    "name": "getSlot1",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "name": "slot",
-        "type": "uint256"
-      }
-    ],
-    "name": "callcodeAddressSetSlot0",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_contractBAddress",
-        "type": "address"
-      },
-      {
-        "name": "_contractCAddress",
-        "type": "address"
-      }
-    ],
-    "name": "eetScenario8",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "callcodeAddressGetSlot0",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_slot0",
-        "type": "uint256"
-      },
-      {
-        "name": "_slot1",
-        "type": "uint256"
-      },
-      {
-        "name": "_slot2",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.bin
deleted file mode 100644
index 6359f8ac1bb3..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516104a43803806104a48339818101604052602081101561003357600080fd5b8101908080519060200190929190505050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610410806100946000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80638053928714610030575b600080fd5b6100ac6004803603608081101561004657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803560070b9060200190929190803560070b90602001909291905050506100ae565b005b60006100dc60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16868686610208565b9050601660030b8114610157576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f546f6b656e207472616e73666572206661696c6564000000000000000000000081525060200191505060405180910390fd5b600061018560008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16878786610208565b9050601660030b8114610200576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f546f6b656e207472616e7366657232206661696c65640000000000000000000081525060200191505060405180910390fd5b505050505050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b88888888604051602401808573ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1681526020018260070b8152602001945050505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b6020831061032c5780518252602082019150602081019050602083039250610309565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461038e576040519150601f19603f3d011682016040523d82523d6000602084013e610393565b606091505b5091509150816103a45760156103cb565b8080602001905160208110156103b957600080fd5b81019080805190602001909291905050505b60030b9250505094935050505056fea2646970667358221220b402ff3a1fbd164e28cae4a980a9737e54086d50ab2cf36b057a286ac90b272b64736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.json
deleted file mode 100644
index f5ba49468bb9..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_address2",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum2",
-        "type": "int64"
-      }
-    ],
-    "name": "transferToAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.bin
deleted file mode 100644
index 480326b65776..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506040516107403803806107408339818101604052602081101561003357600080fd5b8101908080519060200190929190505050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506106ac806100946000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063bb5511f314610030575b600080fd5b610147600480360360a081101561004657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803567ffffffffffffffff169060200190929190803560070b9060200190929190803590602001906401000000008111156100c457600080fd5b8201836020820111156100d657600080fd5b803590602001918460208302840111640100000000831117156100f857600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610149565b005b60008061017760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1686856102a7565b91509150601660030b82146101f4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260118152602001807f546f6b656e206275726e206661696c656400000000000000000000000000000081525060200191505060405180910390fd5b600061022260008054906101000a900473ffffffffffffffffffffffffffffffffffffffff168989886104a4565b9050601660030b811461029d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f546f6b656e207472616e73666572206661696c6564000000000000000000000081525060200191505060405180910390fd5b5050505050505050565b6000806000606061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b888888604051602401808473ffffffffffffffffffffffffffffffffffffffff1681526020018367ffffffffffffffff16815260200180602001828103825283818151815260200191508051906020019060200280838360005b83811015610344578082015181840152602081019050610329565b50505050905001945050505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106103e157805182526020820191506020810190506020830392506103be565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d8060008114610443576040519150601f19603f3d011682016040523d82523d6000602084013e610448565b606091505b50915091508161045b576015600061048c565b80806020019051604081101561047057600080fd5b8101908080519060200190929190805190602001909291905050505b8160030b915080945081955050505050935093915050565b600080606061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b88888888604051602401808573ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1681526020018260070b8152602001945050505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040518082805190602001908083835b602083106105c857805182526020820191506020810190506020830392506105a5565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461062a576040519150601f19603f3d011682016040523d82523d6000602084013e61062f565b606091505b509150915081610640576015610667565b80806020019051602081101561065557600080fd5b81019080805190602001909291905050505b60030b9250505094935050505056fea2646970667358221220b931f532204149906cd923476e81a5faff9e4752bdd37a1807bead3fcae8996564736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.json b/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.json
deleted file mode 100644
index cde0fb0bd0a5..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_address2",
-        "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "amount",
-        "type": "uint64"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "transferBurn",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.bin
deleted file mode 100644
index 4c05c663bc34..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405261062a806100136000396000f3fe60806040526004361061004a5760003560e01c806326ab97ea1461004c5780638dd980431461009a578063acef6037146100c8578063d2a0fe2614610116578063e12e3238146101a4575b005b6100986004803603604081101561006257600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506101f2565b005b6100c6600480360360208110156100b057600080fd5b8101908080359060200190929190505050610423565b005b610114600480360360408110156100de57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061046d565b005b6101a26004803603608081101561012c57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506104b8565b005b6101f0600480360360408110156101ba57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506105a7565b005b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610238573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc6002838161025d57fe5b049081150290604051600060405180830381858888f19350505050158015610289573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc600483816102ae57fe5b049081150290604051600060405180830381858888f193505050501580156102da573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc600883816102ff57fe5b049081150290604051600060405180830381858888f1935050505015801561032b573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc6010838161035057fe5b049081150290604051600060405180830381858888f1935050505015801561037c573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc602083816103a157fe5b049081150290604051600060405180830381858888f193505050501580156103cd573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc604083816103f257fe5b049081150290604051600060405180830381858888f1935050505015801561041e573d6000803e3d6000fd5b505050565b3373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610469573d6000803e3d6000fd5b5050565b8173ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156104b3573d6000803e3d6000fd5b505050565b8373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156104fe573d6000803e3d6000fd5b508273ffffffffffffffffffffffffffffffffffffffff166108fc6002838161052357fe5b049081150290604051600060405180830381858888f1935050505015801561054f573d6000803e3d6000fd5b508173ffffffffffffffffffffffffffffffffffffffff166108fc6004838161057457fe5b049081150290604051600060405180830381858888f193505050501580156105a0573d6000803e3d6000fd5b5050505050565b8173ffffffffffffffffffffffffffffffffffffffff166108fc826000039081150290604051600060405180830381858888f193505050501580156105f0573d6000803e3d6000fd5b50505056fea265627a7a72315820cf791bbf47dcb61393744052a620f771b429f071f02e3657ce3e5f80ab3f97bd64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.json
deleted file mode 100644
index 6950f3bcb4ee..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.json
+++ /dev/null
@@ -1,118 +0,0 @@
-[
-  {
-    "inputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "constructor"
-  },
-  {
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "fallback"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToAddress",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToAddressMultipleTimes",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToAddressNegativeAmount",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToCaller",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "receiver1",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "receiver2",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "receiver3",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferToDifferentAddresses",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.bin
deleted file mode 100644
index 78c8d21b251f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040526040518060400160405280600981526020017f746f6b656e4e616d650000000000000000000000000000000000000000000000815250600290816200004a919062000540565b506040518060400160405280600b81526020017f746f6b656e53796d626f6c0000000000000000000000000000000000000000008152506003908162000091919062000540565b506040518060400160405280600481526020017f6d656d6f0000000000000000000000000000000000000000000000000000000081525060049081620000d8919062000540565b50348015620000e657600080fd5b50600180600080600681111562000102576200010162000627565b5b600681111562000117576200011662000627565b5b8152602001908152602001600020819055506002600160006001600681111562000146576200014562000627565b5b60068111156200015b576200015a62000627565b5b815260200190815260200160002081905550600460016000600260068111156200018a576200018962000627565b5b60068111156200019f576200019e62000627565b5b81526020019081526020016000208190555060086001600060036006811115620001ce57620001cd62000627565b5b6006811115620001e357620001e262000627565b5b8152602001908152602001600020819055506010600160006004600681111562000212576200021162000627565b5b600681111562000227576200022662000627565b5b8152602001908152602001600020819055506020600160006005600681111562000256576200025562000627565b5b60068111156200026b576200026a62000627565b5b81526020019081526020016000208190555060406001600060068081111562000299576200029862000627565b5b6006811115620002ae57620002ad62000627565b5b81526020019081526020016000208190555062000656565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200034857607f821691505b6020821081036200035e576200035d62000300565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b600060088302620003c87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000389565b620003d4868362000389565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620004216200041b6200041584620003ec565b620003f6565b620003ec565b9050919050565b6000819050919050565b6200043d8362000400565b620004556200044c8262000428565b84845462000396565b825550505050565b600090565b6200046c6200045d565b6200047981848462000432565b505050565b5b81811015620004a1576200049560008262000462565b6001810190506200047f565b5050565b601f821115620004f057620004ba8162000364565b620004c58462000379565b81016020851015620004d5578190505b620004ed620004e48562000379565b8301826200047e565b50505b505050565b600082821c905092915050565b60006200051560001984600802620004f5565b1980831691505092915050565b600062000530838362000502565b9150826002028217905092915050565b6200054b82620002c6565b67ffffffffffffffff811115620005675762000566620002d1565b5b6200057382546200032f565b62000580828285620004a5565b600060209050601f831160018114620005b85760008415620005a3578287015190505b620005af858262000522565b8655506200061f565b601f198416620005c88662000364565b60005b82811015620005f257848901518255600182019150602085019450602081019050620005cb565b868310156200061257848901516200060e601f89168262000502565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b61395680620006666000396000f3fe6080604052600436106100c25760003560e01c80637dcbbc721161007f578063eac6f3fe11610059578063eac6f3fe14610254578063eb548eff14610291578063f0072990146102ad578063f1730760146102c9576100c2565b80637dcbbc72146101df5780639b23d3d9146101fb578063e608e18d14610238576100c2565b806311e1fc07146100c757806315dacbea146101045780633aa12ef5146101415780634129b7db1461015d578063618dc65e1461019a57806378fe72a1146101c3575b600080fd5b3480156100d357600080fd5b506100ee60048036038101906100e99190612243565b6102e5565b6040516100fb91906122c6565b60405180910390f35b34801561011057600080fd5b5061012b60048036038101906101269190612243565b610401565b60405161013891906122c6565b60405180910390f35b61015b60048036038101906101569190612453565b61051f565b005b34801561016957600080fd5b50610184600480360381019061017f919061252d565b610770565b6040516101919190612693565b60405180910390f35b3480156101a657600080fd5b506101c160048036038101906101bc91906126b5565b6107a7565b005b6101dd60048036038101906101d89190612711565b6108ce565b005b6101f960048036038101906101f491906127b0565b610a65565b005b34801561020757600080fd5b50610222600480360381019061021d9190612243565b610b85565b60405161022f91906122c6565b60405180910390f35b610252600480360381019061024d91906128a4565b610ca3565b005b34801561026057600080fd5b5061027b60048036038101906102769190612243565b610e80565b60405161028891906122c6565b60405180910390f35b6102ab60048036038101906102a69190612a0f565b610f9c565b005b6102c760048036038101906102c29190612ac2565b611334565b005b6102e360048036038101906102de9190612b02565b611587565b005b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b888888886040516024016103229493929190612bbf565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161038c9190612c40565b600060405180830381855af49150503d80600081146103c7576040519150601f19603f3d011682016040523d82523d6000602084013e6103cc565b606091505b5091509150816103dd5760156103f2565b808060200190518101906103f19190612c90565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b8888888860405160240161043e9493929190612bbf565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516104a89190612c40565b6000604051808303816000865af19150503d80600081146104e5576040519150601f19603f3d011682016040523d82523d6000602084013e6104ea565b606091505b5091509150816104fb576015610510565b8080602001905181019061050f9190612c90565b5b60030b92505050949350505050565b6000600567ffffffffffffffff81111561053c5761053b6122fc565b5b60405190808252806020026020018201604052801561057557816020015b610562612072565b81526020019060019003908161055a5790505b509050610587600060016002896116c8565b8160008151811061059b5761059a612cbd565b5b60200260200101819052506105b46002600380886116c8565b816001815181106105c8576105c7612cbd565b5b60200260200101819052506105e06004600186611701565b816002815181106105f4576105f3612cbd565b5b602002602001018190525061060c6006600186611701565b816003815181106106205761061f612cbd565b5b60200260200101819052506106386005600486611701565b8160048151811061064c5761064b612cbd565b5b602002602001018190525061065f612092565b6000816000019060070b908160070b8152505083816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505082816040019060070b908160070b815250506106c46120cf565b88816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050828160e0018190525081816101000181905250600061071b8b83611738565b9050601660030b8114610763576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161075a90612d49565b60405180910390fd5b5050505050505050505050565b61077861213e565b6000806107858585611850565b915060070b9150601660030b821461079c57600080fd5b809250505092915050565b60008061016773ffffffffffffffffffffffffffffffffffffffff1663618dc65e60e01b85856040516024016107de929190612db3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108489190612c40565b6000604051808303816000865af19150503d8060008114610885576040519150601f19603f3d011682016040523d82523d6000602084013e61088a565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc82826040516108c0929190612df2565b60405180910390a150505050565b6000600567ffffffffffffffff8111156108eb576108ea6122fc565b5b60405190808252806020026020018201604052801561092457816020015b610911612072565b8152602001906001900390816109095790505b509050610936600060016002876116c8565b8160008151811061094a57610949612cbd565b5b60200260200101819052506109636002600380866116c8565b8160018151811061097757610976612cbd565b5b602002602001018190525061098f6004600184611701565b816002815181106109a3576109a2612cbd565b5b60200260200101819052506109bb6006600184611701565b816003815181106109cf576109ce612cbd565b5b60200260200101819052506109e76005600484611701565b816004815181106109fb576109fa612cbd565b5b60200260200101819052506000610a128683611984565b60070b9050601660030b8114610a5d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a5490612e6e565b60405180910390fd5b505050505050565b6000600167ffffffffffffffff811115610a8257610a816122fc565b5b604051908082528060200260200182016040528015610abb57816020015b610aa8612072565b815260200190600190039081610aa05790505b509050610ac6612072565b6004816000018181525050610ad961213e565b30816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505060018160000190151590811515815250508082602001819052508183600081518110610b4057610b3f612cbd565b5b60200260200101819052506000610b5b306000888888611a9c565b90506000610b698883611738565b9050601660030b8114610b7b57600080fd5b5050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16639b23d3d960e01b88888888604051602401610bc29493929190612bbf565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610c2c9190612c40565b6000604051808303816000865af19150503d8060008114610c69576040519150601f19603f3d011682016040523d82523d6000602084013e610c6e565b606091505b509150915081610c7f576015610c94565b80806020019051810190610c939190612c90565b5b60030b92505050949350505050565b6000600567ffffffffffffffff811115610cc057610cbf6122fc565b5b604051908082528060200260200182016040528015610cf957816020015b610ce6612072565b815260200190600190039081610cde5790505b509050610d0b6000600160028c6116c8565b81600081518110610d1f57610d1e612cbd565b5b6020026020010181905250610d3860026003808b6116c8565b81600181518110610d4c57610d4b612cbd565b5b6020026020010181905250610d646004600189611701565b81600281518110610d7857610d77612cbd565b5b6020026020010181905250610d906006600189611701565b81600381518110610da457610da3612cbd565b5b6020026020010181905250610dbc6005600489611701565b81600481518110610dd057610dcf612cbd565b5b60200260200101819052508360029081610dea91906130a5565b508260039081610dfa91906130a5565b508160049081610e0a91906130a5565b506000610e1b8b6000898986611a9c565b90506000610e298d83611738565b9050601660030b8114610e71576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e6890612d49565b60405180910390fd5b50505050505050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166315dacbea60e01b88888888604051602401610ebd9493929190612bbf565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610f279190612c40565b600060405180830381855af49150503d8060008114610f62576040519150601f19603f3d011682016040523d82523d6000602084013e610f67565b606091505b509150915081610f78576015610f8d565b80806020019051810190610f8c9190612c90565b5b60030b92505050949350505050565b6000600567ffffffffffffffff811115610fb957610fb86122fc565b5b604051908082528060200260200182016040528015610ff257816020015b610fdf612072565b815260200190600190039081610fd75790505b509050611004600060016002876116c8565b8160008151811061101857611017612cbd565b5b60200260200101819052506110316002600380866116c8565b8160018151811061104557611044612cbd565b5b602002602001018190525061105d6004600184611701565b8160028151811061107157611070612cbd565b5b60200260200101819052506110896006600184611701565b8160038151811061109d5761109c612cbd565b5b60200260200101819052506110b56005600484611701565b816004815181106110c9576110c8612cbd565b5b60200260200101819052506110dc6120cf565b85816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250506002805461112190612ec8565b80601f016020809104026020016040519081016040528092919081815260200182805461114d90612ec8565b801561119a5780601f1061116f5761010080835404028352916020019161119a565b820191906000526020600020905b81548152906001019060200180831161117d57829003601f168201915b50505050508160000181905250600380546111b490612ec8565b80601f01602080910402602001604051908101604052809291908181526020018280546111e090612ec8565b801561122d5780601f106112025761010080835404028352916020019161122d565b820191906000526020600020905b81548152906001019060200180831161121057829003601f168201915b50505050508160200181905250818160e001819052506004805461125090612ec8565b80601f016020809104026020016040519081016040528092919081815260200182805461127c90612ec8565b80156112c95780601f1061129e576101008083540402835291602001916112c9565b820191906000526020600020905b8154815290600101906020018083116112ac57829003601f168201915b5050505050816060018190525060006112e28883611738565b9050601660030b811461132a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611321906131c3565b60405180910390fd5b5050505050505050565b61133c6120cf565b6002805461134990612ec8565b80601f016020809104026020016040519081016040528092919081815260200182805461137590612ec8565b80156113c25780601f10611397576101008083540402835291602001916113c2565b820191906000526020600020905b8154815290600101906020018083116113a557829003601f168201915b50505050508160000181905250600380546113dc90612ec8565b80601f016020809104026020016040519081016040528092919081815260200182805461140890612ec8565b80156114555780601f1061142a57610100808354040283529160200191611455565b820191906000526020600020905b81548152906001019060200180831161143857829003601f168201915b5050505050816020018190525081816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050600480546114a790612ec8565b80601f01602080910402602001604051908101604052809291908181526020018280546114d390612ec8565b80156115205780601f106114f557610100808354040283529160200191611520565b820191906000526020600020905b81548152906001019060200180831161150357829003601f168201915b5050505050816060018190525060006115398483611738565b9050601660030b8114611581576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161157890613255565b60405180910390fd5b50505050565b61158f6120cf565b82816000018190525081816020018190525083816040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050600480546115e690612ec8565b80601f016020809104026020016040519081016040528092919081815260200182805461161290612ec8565b801561165f5780601f106116345761010080835404028352916020019161165f565b820191906000526020600020905b81548152906001019060200180831161164257829003601f168201915b5050505050816060018190525060006116788683611738565b9050601660030b81146116c0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116b7906132e7565b60405180910390fd5b505050505050565b6116d0612072565b60405180604001604052806116e58787611d16565b81526020016116f48585611d6c565b8152509050949350505050565b611709612072565b604051806040016040528061171d86611f41565b815260200161172c8585611f82565b81525090509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637d305cfa60e01b8686604051602401611771929190613607565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516117db9190612c40565b6000604051808303816000865af19150503d8060008114611818576040519150601f19603f3d011682016040523d82523d6000602084013e61181d565b606091505b50915091508161182e576015611843565b808060200190518101906118429190612c90565b5b60030b9250505092915050565b600061185a61213e565b60008061016773ffffffffffffffffffffffffffffffffffffffff16633c4dd32e60e01b8787604051602401611891929190613637565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516118fb9190612c40565b6000604051808303816000865af19150503d8060008114611938576040519150601f19603f3d011682016040523d82523d6000602084013e61193d565b606091505b509150915061194a61213e565b826119575760158161196c565b8180602001905181019061196b91906137df565b5b8160030b915080955081965050505050509250929050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16636fc3cbaf60e01b86866040516024016119bd9291906138c1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611a279190612c40565b6000604051808303816000865af19150503d8060008114611a64576040519150601f19603f3d011682016040523d82523d6000602084013e611a69565b606091505b509150915081611a7a576015611a8f565b80806020019051810190611a8e9190612c90565b5b60030b9250505092915050565b611aa46120cf565b611aac612092565b85816000019060070b908160070b8152505084816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505083816040019060070b908160070b8152505060028054611b1590612ec8565b80601f0160208091040260200160405190810160405280929190818152602001828054611b4190612ec8565b8015611b8e5780601f10611b6357610100808354040283529160200191611b8e565b820191906000526020600020905b815481529060010190602001808311611b7157829003601f168201915b5050505050826000018190525060038054611ba890612ec8565b80601f0160208091040260200160405190810160405280929190818152602001828054611bd490612ec8565b8015611c215780601f10611bf657610100808354040283529160200191611c21565b820191906000526020600020905b815481529060010190602001808311611c0457829003601f168201915b5050505050826020018190525086826040019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050828260e001819052508082610100018190525060048054611c8690612ec8565b80601f0160208091040260200160405190810160405280929190818152602001828054611cb290612ec8565b8015611cff5780601f10611cd457610100808354040283529160200191611cff565b820191906000526020600020905b815481529060010190602001808311611ce257829003601f168201915b505050505082606001819052505095945050505050565b6000611d3d836006811115611d2e57611d2d6138f1565b5b8261205e90919063ffffffff16565b9050611d64826006811115611d5557611d546138f1565b5b8261205e90919063ffffffff16565b905092915050565b611d7461213e565b60006004811115611d8857611d876138f1565b5b836004811115611d9b57611d9a6138f1565b5b03611db6576001816000019015159081151581525050611f3b565b60016004811115611dca57611dc96138f1565b5b836004811115611ddd57611ddc6138f1565b5b03611e3f5760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050611f3a565b60026004811115611e5357611e526138f1565b5b836004811115611e6657611e656138f1565b5b03611e7957818160400181905250611f39565b60036004811115611e8d57611e8c6138f1565b5b836004811115611ea057611e9f6138f1565b5b03611eb357818160600181905250611f38565b600480811115611ec657611ec56138f1565b5b836004811115611ed957611ed86138f1565b5b03611f375760008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b5b5b5b5b92915050565b600060016000836006811115611f5a57611f596138f1565b5b6006811115611f6c57611f6b6138f1565b5b8152602001908152602001600020549050919050565b611f8a61213e565b60016004811115611f9e57611f9d6138f1565b5b836004811115611fb157611fb06138f1565b5b03611ff35781816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050612058565b600480811115612006576120056138f1565b5b836004811115612019576120186138f1565b5b036120575781816080019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b5b92915050565b60008160ff166001901b8317905092915050565b60405180604001604052806000815260200161208c61213e565b81525090565b6040518060600160405280600060070b8152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600060070b81525090565b6040518061012001604052806060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160608152602001600015158152602001600060070b815260200160001515815260200160608152602001612138612092565b81525090565b6040518060a00160405280600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020016060815260200160608152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006121da826121af565b9050919050565b6121ea816121cf565b81146121f557600080fd5b50565b600081359050612207816121e1565b92915050565b6000819050919050565b6122208161220d565b811461222b57600080fd5b50565b60008135905061223d81612217565b92915050565b6000806000806080858703121561225d5761225c6121a5565b5b600061226b878288016121f8565b945050602061227c878288016121f8565b935050604061228d878288016121f8565b925050606061229e8782880161222e565b91505092959194509250565b60008160070b9050919050565b6122c0816122aa565b82525050565b60006020820190506122db60008301846122b7565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b612334826122eb565b810181811067ffffffffffffffff82111715612353576123526122fc565b5b80604052505050565b600061236661219b565b9050612372828261232b565b919050565b600067ffffffffffffffff821115612392576123916122fc565b5b61239b826122eb565b9050602081019050919050565b82818337600083830152505050565b60006123ca6123c584612377565b61235c565b9050828152602081018484840111156123e6576123e56122e6565b5b6123f18482856123a8565b509392505050565b600082601f83011261240e5761240d6122e1565b5b813561241e8482602086016123b7565b91505092915050565b612430816122aa565b811461243b57600080fd5b50565b60008135905061244d81612427565b92915050565b600080600080600080600060e0888a031215612472576124716121a5565b5b60006124808a828b016121f8565b97505060206124918a828b016121f8565b965050604088013567ffffffffffffffff8111156124b2576124b16121aa565b5b6124be8a828b016123f9565b955050606088013567ffffffffffffffff8111156124df576124de6121aa565b5b6124eb8a828b016123f9565b94505060806124fc8a828b016121f8565b93505060a061250d8a828b016121f8565b92505060c061251e8a828b0161243e565b91505092959891949750929550565b60008060408385031215612544576125436121a5565b5b6000612552858286016121f8565b92505060206125638582860161222e565b9150509250929050565b60008115159050919050565b6125828161256d565b82525050565b612591816121cf565b82525050565b600081519050919050565b600082825260208201905092915050565b60005b838110156125d15780820151818401526020810190506125b6565b60008484015250505050565b60006125e882612597565b6125f281856125a2565b93506126028185602086016125b3565b61260b816122eb565b840191505092915050565b600060a08301600083015161262e6000860182612579565b5060208301516126416020860182612588565b506040830151848203604086015261265982826125dd565b9150506060830151848203606086015261267382826125dd565b91505060808301516126886080860182612588565b508091505092915050565b600060208201905081810360008301526126ad8184612616565b905092915050565b600080604083850312156126cc576126cb6121a5565b5b60006126da858286016121f8565b925050602083013567ffffffffffffffff8111156126fb576126fa6121aa565b5b612707858286016123f9565b9150509250929050565b6000806000806080858703121561272b5761272a6121a5565b5b6000612739878288016121f8565b945050602085013567ffffffffffffffff81111561275a576127596121aa565b5b612766878288016123f9565b935050604085013567ffffffffffffffff811115612787576127866121aa565b5b612793878288016123f9565b92505060606127a4878288016121f8565b91505092959194509250565b6000806000606084860312156127c9576127c86121a5565b5b60006127d7868287016121f8565b93505060206127e8868287016121f8565b92505060406127f98682870161243e565b9150509250925092565b600067ffffffffffffffff82111561281e5761281d6122fc565b5b612827826122eb565b9050602081019050919050565b600061284761284284612803565b61235c565b905082815260208101848484011115612863576128626122e6565b5b61286e8482856123a8565b509392505050565b600082601f83011261288b5761288a6122e1565b5b813561289b848260208601612834565b91505092915050565b6000806000806000806000806000806101408b8d0312156128c8576128c76121a5565b5b60006128d68d828e016121f8565b9a505060206128e78d828e016121f8565b99505060408b013567ffffffffffffffff811115612908576129076121aa565b5b6129148d828e016123f9565b98505060608b013567ffffffffffffffff811115612935576129346121aa565b5b6129418d828e016123f9565b97505060806129528d828e016121f8565b96505060a06129638d828e016121f8565b95505060c06129748d828e0161243e565b94505060e08b013567ffffffffffffffff811115612995576129946121aa565b5b6129a18d828e01612876565b9350506101008b013567ffffffffffffffff8111156129c3576129c26121aa565b5b6129cf8d828e01612876565b9250506101208b013567ffffffffffffffff8111156129f1576129f06121aa565b5b6129fd8d828e01612876565b9150509295989b9194979a5092959850565b600080600080600060a08688031215612a2b57612a2a6121a5565b5b6000612a39888289016121f8565b9550506020612a4a888289016121f8565b945050604086013567ffffffffffffffff811115612a6b57612a6a6121aa565b5b612a77888289016123f9565b935050606086013567ffffffffffffffff811115612a9857612a976121aa565b5b612aa4888289016123f9565b9250506080612ab5888289016121f8565b9150509295509295909350565b60008060408385031215612ad957612ad86121a5565b5b6000612ae7858286016121f8565b9250506020612af8858286016121f8565b9150509250929050565b60008060008060808587031215612b1c57612b1b6121a5565b5b6000612b2a878288016121f8565b9450506020612b3b878288016121f8565b935050604085013567ffffffffffffffff811115612b5c57612b5b6121aa565b5b612b6887828801612876565b925050606085013567ffffffffffffffff811115612b8957612b886121aa565b5b612b9587828801612876565b91505092959194509250565b612baa816121cf565b82525050565b612bb98161220d565b82525050565b6000608082019050612bd46000830187612ba1565b612be16020830186612ba1565b612bee6040830185612ba1565b612bfb6060830184612bb0565b95945050505050565b600081905092915050565b6000612c1a82612597565b612c248185612c04565b9350612c348185602086016125b3565b80840191505092915050565b6000612c4c8284612c0f565b915081905092915050565b60008160030b9050919050565b612c6d81612c57565b8114612c7857600080fd5b50565b600081519050612c8a81612c64565b92915050565b600060208284031215612ca657612ca56121a5565b5b6000612cb484828501612c7b565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082825260208201905092915050565b7f557064617465206f6620746f6b656e496e666f206661696c6564210000000000600082015250565b6000612d33601b83612cec565b9150612d3e82612cfd565b602082019050919050565b60006020820190508181036000830152612d6281612d26565b9050919050565b600082825260208201905092915050565b6000612d8582612597565b612d8f8185612d69565b9350612d9f8185602086016125b3565b612da8816122eb565b840191505092915050565b6000604082019050612dc86000830185612ba1565b8181036020830152612dda8184612d7a565b90509392505050565b612dec8161256d565b82525050565b6000604082019050612e076000830185612de3565b8181036020830152612e198184612d7a565b90509392505050565b7f557064617465206f6620746f6b656e206b657973206661696c65642100000000600082015250565b6000612e58601c83612cec565b9150612e6382612e22565b602082019050919050565b60006020820190508181036000830152612e8781612e4b565b9050919050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680612ee057607f821691505b602082108103612ef357612ef2612e99565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b600060088302612f5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82612f1e565b612f658683612f1e565b95508019841693508086168417925050509392505050565b6000819050919050565b6000612fa2612f9d612f988461220d565b612f7d565b61220d565b9050919050565b6000819050919050565b612fbc83612f87565b612fd0612fc882612fa9565b848454612f2b565b825550505050565b600090565b612fe5612fd8565b612ff0818484612fb3565b505050565b5b8181101561301457613009600082612fdd565b600181019050612ff6565b5050565b601f8211156130595761302a81612ef9565b61303384612f0e565b81016020851015613042578190505b61305661304e85612f0e565b830182612ff5565b50505b505050565b600082821c905092915050565b600061307c6000198460080261305e565b1980831691505092915050565b6000613095838361306b565b9150826002028217905092915050565b6130ae82612e8e565b67ffffffffffffffff8111156130c7576130c66122fc565b5b6130d18254612ec8565b6130dc828285613018565b600060209050601f83116001811461310f57600084156130fd578287015190505b6131078582613089565b86555061316f565b601f19841661311d86612ef9565b60005b8281101561314557848901518255600182019150602085019450602081019050613120565b86831015613162578489015161315e601f89168261306b565b8355505b6001600288020188555050505b505050505050565b7f557064617465206f6620746f6b656e496e666f206b657973206661696c656421600082015250565b60006131ad602083612cec565b91506131b882613177565b602082019050919050565b600060208201905081810360008301526131dc816131a0565b9050919050565b7f557064617465206f6620746f6b656e496e666f2e74726561737572792066616960008201527f6c65642100000000000000000000000000000000000000000000000000000000602082015250565b600061323f602483612cec565b915061324a826131e3565b604082019050919050565b6000602082019050818103600083015261326e81613232565b9050919050565b7f557064617465206f6620746f6b656e496e666f206e616d6520616e642073796d60008201527f626f6c206661696c656421000000000000000000000000000000000000000000602082015250565b60006132d1602b83612cec565b91506132dc82613275565b604082019050919050565b60006020820190508181036000830152613300816132c4565b9050919050565b600082825260208201905092915050565b600061332382612e8e565b61332d8185613307565b935061333d8185602086016125b3565b613346816122eb565b840191505092915050565b61335a816122aa565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6133958161220d565b82525050565b600060a0830160008301516133b36000860182612579565b5060208301516133c66020860182612588565b50604083015184820360408601526133de82826125dd565b915050606083015184820360608601526133f882826125dd565b915050608083015161340d6080860182612588565b508091505092915050565b6000604083016000830151613430600086018261338c565b5060208301518482036020860152613448828261339b565b9150508091505092915050565b60006134618383613418565b905092915050565b6000602082019050919050565b600061348182613360565b61348b818561336b565b93508360208202850161349d8561337c565b8060005b858110156134d957848403895281516134ba8582613455565b94506134c583613469565b925060208a019950506001810190506134a1565b50829750879550505050505092915050565b6060820160008201516135016000850182613351565b5060208201516135146020850182612588565b5060408201516135276040850182613351565b50505050565b600061016083016000830151848203600086015261354b8282613318565b915050602083015184820360208601526135658282613318565b915050604083015161357a6040860182612588565b50606083015184820360608601526135928282613318565b91505060808301516135a76080860182612579565b5060a08301516135ba60a0860182613351565b5060c08301516135cd60c0860182612579565b5060e083015184820360e08601526135e58282613476565b9150506101008301516135fc6101008601826134eb565b508091505092915050565b600060408201905061361c6000830185612ba1565b818103602083015261362e818461352d565b90509392505050565b600060408201905061364c6000830185612ba1565b6136596020830184612bb0565b9392505050565b600080fd5b600080fd5b6136738161256d565b811461367e57600080fd5b50565b6000815190506136908161366a565b92915050565b6000815190506136a5816121e1565b92915050565b60006136be6136b984612377565b61235c565b9050828152602081018484840111156136da576136d96122e6565b5b6136e58482856125b3565b509392505050565b600082601f830112613702576137016122e1565b5b81516137128482602086016136ab565b91505092915050565b600060a0828403121561373157613730613660565b5b61373b60a061235c565b9050600061374b84828501613681565b600083015250602061375f84828501613696565b602083015250604082015167ffffffffffffffff81111561378357613782613665565b5b61378f848285016136ed565b604083015250606082015167ffffffffffffffff8111156137b3576137b2613665565b5b6137bf848285016136ed565b60608301525060806137d384828501613696565b60808301525092915050565b600080604083850312156137f6576137f56121a5565b5b600061380485828601612c7b565b925050602083015167ffffffffffffffff811115613825576138246121aa565b5b6138318582860161371b565b9150509250929050565b600082825260208201905092915050565b600061385782613360565b613861818561383b565b9350836020820285016138738561337c565b8060005b858110156138af57848403895281516138908582613455565b945061389b83613469565b925060208a01995050600181019050613877565b50829750879550505050505092915050565b60006040820190506138d66000830185612ba1565b81810360208301526138e8818461384c565b90509392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fdfea2646970667358221220ed01700be59216ec03165b8a21fd95cccf9476c56b93ab5997872a8dfdecba6464736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.json b/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.json
deleted file mode 100644
index 3ca44ba3dd91..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.json
+++ /dev/null
@@ -1,457 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "name": "CallResponseEvent",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      }
-    ],
-    "name": "checkNameAndSymbolLength",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "delegateTransferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "keyType",
-        "type": "uint256"
-      }
-    ],
-    "name": "getKeyFromToken",
-    "outputs": [
-      {
-        "components": [
-          {
-            "internalType": "bool",
-            "name": "inheritAccountKey",
-            "type": "bool"
-          },
-          {
-            "internalType": "address",
-            "name": "contractId",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ed25519",
-            "type": "bytes"
-          },
-          {
-            "internalType": "bytes",
-            "name": "ECDSA_secp256k1",
-            "type": "bytes"
-          },
-          {
-            "internalType": "address",
-            "name": "delegatableContractId",
-            "type": "address"
-          }
-        ],
-        "internalType": "struct IHederaTokenService.KeyValue",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "encodedFunctionSelector",
-        "type": "bytes"
-      }
-    ],
-    "name": "redirectForToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ecdsa",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      }
-    ],
-    "name": "tokenUpdateKeys",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "serialNumber",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFromNFT",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "responseCode",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      }
-    ],
-    "name": "updateTokenTreasury",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ecdsa",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "autoRenewPeriod",
-        "type": "int64"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_memo",
-        "type": "string"
-      }
-    ],
-    "name": "updateTokenWithAllFields",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "autoRenewPeriod",
-        "type": "int64"
-      }
-    ],
-    "name": "updateTokenWithInvalidKeyValues",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ecdsa",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      }
-    ],
-    "name": "updateTokenWithKeys",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ed25519",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes",
-        "name": "ecdsa",
-        "type": "bytes"
-      },
-      {
-        "internalType": "address",
-        "name": "contractID",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "autoRenewAccount",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "autoRenewPeriod",
-        "type": "int64"
-      }
-    ],
-    "name": "updateTokenWithoutNameSymbolMemo",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.bin
deleted file mode 100644
index 8170d6005cd2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506106db806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80631d834a1b146100465780634cc8221514610076578063853255cc146100a6575b600080fd5b610060600480360381019061005b919061047d565b6100c4565b60405161006d91906104cc565b60405180910390f35b610090600480360381019061008b91906104e7565b6100eb565b60405161009d919061052f565b60405180910390f35b6100ae610108565b6040516100bb91906104cc565b60405180910390f35b60006100dc838360006101789092919063ffffffff16565b50600060020154905092915050565b600061010182600061026c90919063ffffffff16565b9050919050565b6000806101156000610333565b90505b61012c81600061036690919063ffffffff16565b1561017457600061014782600061037a90919063ffffffff16565b91505080836101569190610579565b92505061016d8160006103c990919063ffffffff16565b9050610118565b5090565b600080846000016000858152602001908152602001600020600001549050828560000160008681526020019081526020016000206001018190555060008111156101c6576001915050610265565b8460010180549050905084600101600181600181540180825580915050039060005260206000209050506001816101fd9190610579565b85600001600086815260200190815260200160002060000181905550838560010182815481106102305761022f6105cf565b5b90600052602060002090600202016000018190555084600201600081548092919061025a906105fe565b919050555060009150505b9392505050565b600080836000016000848152602001908152602001600020600001549050600081141561029d57600091505061032d565b836000016000848152602001908152602001600020600080820160009055600182016000905550506001846001016001836102d89190610647565b815481106102e9576102e86105cf565b5b906000526020600020906002020160010160006101000a81548160ff0219169083151502179055508360020160008154809291906103269061067b565b9190505550505b92915050565b600061035f827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6103c9565b9050919050565b600082600101805490508210905092915050565b600080836001018381548110610393576103926105cf565b5b90600052602060002090600202016000015491508360000160008381526020019081526020016000206001015490509250929050565b600081806103d6906105fe565b9250505b8260010180549050821080156104215750826001018281548110610401576104006105cf565b5b906000526020600020906002020160010160009054906101000a900460ff165b15610439578180610431906105fe565b9250506103da565b81905092915050565b600080fd5b6000819050919050565b61045a81610447565b811461046557600080fd5b50565b60008135905061047781610451565b92915050565b6000806040838503121561049457610493610442565b5b60006104a285828601610468565b92505060206104b385828601610468565b9150509250929050565b6104c681610447565b82525050565b60006020820190506104e160008301846104bd565b92915050565b6000602082840312156104fd576104fc610442565b5b600061050b84828501610468565b91505092915050565b60008115159050919050565b61052981610514565b82525050565b60006020820190506105446000830184610520565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061058482610447565b915061058f83610447565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff038211156105c4576105c361054a565b5b828201905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600061060982610447565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82141561063c5761063b61054a565b5b600182019050919050565b600061065282610447565b915061065d83610447565b9250828210156106705761066f61054a565b5b828203905092915050565b600061068682610447565b9150600082141561069a5761069961054a565b5b60018203905091905056fea2646970667358221220d017b40c93692767b5172483ae34aa5552b2605f7501dcfb050f81442447a30664736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.json b/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.json
deleted file mode 100644
index 8bec497f6846..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "k",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "v",
-        "type": "uint256"
-      }
-    ],
-    "name": "insert",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "size",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "k",
-        "type": "uint256"
-      }
-    ],
-    "name": "remove",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "success",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "sum",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "s",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.bin
deleted file mode 100644
index 035326c1421c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b507f010101010101010010101010101010010101010101010111010101010101010160001b6040516100419061010f565b8190604051809103906000f5905080158015610061573d6000803e3d6000fd5b50600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040516100ae9061010f565b604051809103906000f0801580156100ca573d6000803e3d6000fd5b506000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061011c565b6105a18061091683390190565b6107eb8061012b6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063107c413f146100515780632659805f1461006f5780634d1fa5181461008d5780636ada3c62146100ab575b600080fd5b6100596100c9565b6040516100669190610526565b60405180910390f35b610077610161565b6040516100849190610526565b60405180910390f35b610095610297565b6040516100a29190610526565b60405180910390f35b6100b36103cd565b6040516100c09190610526565b60405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d39538226040518163ffffffff1660e01b8152600401602060405180830381865afa158015610138573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061015c9190610572565b905090565b60008063d395382260e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663399d9baa60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff1660e01b815260040161024e929190610638565b6020604051808303816000875af115801561026d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102919190610572565b91505090565b60008063d395382260e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d6d2b6ba60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16836040518363ffffffff1660e01b81526004016103849291906106c7565b6020604051808303816000875af11580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c79190610572565b91505090565b60008063d395382260e01b604051602401604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505090506000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16826040516104869190610733565b600060405180830381855afa9150503d80600081146104c1576040519150601f19603f3d011682016040523d82523d6000602084013e6104c6565b606091505b50915050808060200190518101906104de9190610788565b9250505090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610510826104e5565b9050919050565b61052081610505565b82525050565b600060208201905061053b6000830184610517565b92915050565b600080fd5b61054f81610505565b811461055a57600080fd5b50565b60008151905061056c81610546565b92915050565b60006020828403121561058857610587610541565b5b60006105968482850161055d565b91505092915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156105d95780820151818401526020810190506105be565b838111156105e8576000848401525b50505050565b6000601f19601f8301169050919050565b600061060a8261059f565b61061481856105aa565b93506106248185602086016105bb565b61062d816105ee565b840191505092915050565b600060408201905061064d6000830185610517565b818103602083015261065f81846105ff565b90509392505050565b6000819050919050565b600061068d610688610683846104e5565b610668565b6104e5565b9050919050565b600061069f82610672565b9050919050565b60006106b182610694565b9050919050565b6106c1816106a6565b82525050565b60006040820190506106dc60008301856106b8565b81810360208301526106ee81846105ff565b90509392505050565b600081905092915050565b600061070d8261059f565b61071781856106f7565b93506107278185602086016105bb565b80840191505092915050565b600061073f8284610702565b915081905092915050565b6000610755826104e5565b9050919050565b6107658161074a565b811461077057600080fd5b50565b6000815190506107828161075c565b92915050565b60006020828403121561079e5761079d610541565b5b60006107ac84828501610773565b9150509291505056fea2646970667358221220ef4f0f6251a4ce75619db0744ffdc72701ec791e9cf0e8d853717426fa40b3e064736f6c634300080c0033608060405234801561001057600080fd5b50610581806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063399d9baa14610046578063d395382214610076578063d6d2b6ba14610094575b600080fd5b610060600480360381019061005b919061032f565b6100c4565b60405161006d919061039a565b60405180910390f35b61007e6100e6565b60405161008b919061039a565b60405180910390f35b6100ae60048036038101906100a991906103f3565b6100ee565b6040516100bb919061039a565b60405180910390f35b60008060405160a0818551602087016000895af2915080519250505092915050565b600030905090565b6000808373ffffffffffffffffffffffffffffffffffffffff168360405161011691906104c9565b600060405180830381855af49150503d8060008114610151576040519150601f19603f3d011682016040523d82523d6000602084013e610156565b606091505b509150508080602001905181019061016e919061051e565b91505092915050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101b68261018b565b9050919050565b6101c6816101ab565b81146101d157600080fd5b50565b6000813590506101e3816101bd565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61023c826101f3565b810181811067ffffffffffffffff8211171561025b5761025a610204565b5b80604052505050565b600061026e610177565b905061027a8282610233565b919050565b600067ffffffffffffffff82111561029a57610299610204565b5b6102a3826101f3565b9050602081019050919050565b82818337600083830152505050565b60006102d26102cd8461027f565b610264565b9050828152602081018484840111156102ee576102ed6101ee565b5b6102f98482856102b0565b509392505050565b600082601f830112610316576103156101e9565b5b81356103268482602086016102bf565b91505092915050565b6000806040838503121561034657610345610181565b5b6000610354858286016101d4565b925050602083013567ffffffffffffffff81111561037557610374610186565b5b61038185828601610301565b9150509250929050565b610394816101ab565b82525050565b60006020820190506103af600083018461038b565b92915050565b60006103c0826101ab565b9050919050565b6103d0816103b5565b81146103db57600080fd5b50565b6000813590506103ed816103c7565b92915050565b6000806040838503121561040a57610409610181565b5b6000610418858286016103de565b925050602083013567ffffffffffffffff81111561043957610438610186565b5b61044585828601610301565b9150509250929050565b600081519050919050565b600081905092915050565b60005b83811015610483578082015181840152602081019050610468565b83811115610492576000848401525b50505050565b60006104a38261044f565b6104ad818561045a565b93506104bd818560208601610465565b80840191505092915050565b60006104d58284610498565b915081905092915050565b60006104eb8261018b565b9050919050565b6104fb816104e0565b811461050657600080fd5b50565b600081519050610518816104f2565b92915050565b60006020828403121561053457610533610181565b5b600061054284828501610509565b9150509291505056fea26469706673582212203a8f4a322c7c6a890cccbe13305aae3e2ac38e09f50dd9cef891637c7af72ac664736f6c634300080c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.json b/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.json
deleted file mode 100644
index 3ba1bcfe2d7f..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.json
+++ /dev/null
@@ -1,59 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "makeCallCode",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "makeDelegateCall",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "makeNormalCall",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "makeStaticCall",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.bin
deleted file mode 100644
index e6032b97304b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061034c806100206000396000f3fe60806040526004361061001e5760003560e01c80639af9a40e14610023575b600080fd5b6100fc6004803603606081101561003957600080fd5b81019080803563ffffffff169060200190929190803563ffffffff1690602001909291908035906020019064010000000081111561007657600080fd5b82018360208201111561008857600080fd5b803590602001918460018302840111640100000000831117156100aa57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050509192919290505050610177565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561013c578082015181840152602081019050610121565b50505050905090810190601f1680156101695780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60608363ffffffff16341461018b57600080fd5b6060829050606081518563ffffffff16026040519080825280601f01601f1916602001820160405280156101ce5781602001600182028038833980820191505090505b5090505b60008563ffffffff16111561030b577fd37af80ddae6a40e061024d2c6d696a9958a0b683f1c8dd89d4c306f7d745aab846040518080602001828103825283818151815260200191508051906020019080838360005b83811015610243578082015181840152602081019050610228565b50505050905090810190601f1680156102705780820380516001836020036101000a031916815260200191505b509250505060405180910390a184806001900395505060008090505b82518110156103055760008184518863ffffffff16020190508382815181106102b157fe5b602001015160f81c60f81b8382815181106102c857fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535050808060010191505061028c565b506101d2565b8092505050939250505056fea265627a7a7231582014a7f497c9f0ecdb212885b8fb3cb944fd766b6448e7120f724beec1ed00218f64736f6c63430005110032
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.json b/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.json
deleted file mode 100644
index a917e981b56b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "s",
-        "type": "string"
-      }
-    ],
-    "name": "DepositMemo",
-    "type": "event"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      },
-      {
-        "internalType": "uint32",
-        "name": "timesForEmphasis",
-        "type": "uint32"
-      },
-      {
-        "internalType": "string",
-        "name": "memo",
-        "type": "string"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "outcome",
-        "type": "string"
-      }
-    ],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.bin
deleted file mode 100644
index 4aa5c5ab56ab..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.bin
+++ /dev/null
@@ -1 +0,0 @@
-60806040523480156200001157600080fd5b5060405162001746380380620017468339818101604052810190620000379190620000e8565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506200011a565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620000b08262000083565b9050919050565b620000c281620000a3565b8114620000ce57600080fd5b50565b600081519050620000e281620000b7565b92915050565b6000602082840312156200010157620001006200007e565b5b60006200011184828501620000d1565b91505092915050565b61161c806200012a6000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c8063265b6492146100675780633216102b146100835780634b1e3c071461009f5780637c41ad2c146100bb578063ccf48548146100eb578063f5dc8bca14610107575b600080fd5b610081600480360381019061007c9190610b85565b610123565b005b61009d60048036038101906100989190610e8c565b6102bb565b005b6100b960048036038101906100b49190610f47565b610318565b005b6100d560048036038101906100d09190610fdc565b6103f7565b6040516100e29190611022565b60405180910390f35b6101056004803603810190610100919061103d565b61050c565b005b610121600480360381019061011c9190610b85565b610569565b005b60006101b288878780806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050868680806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050610701565b9050601660030b81146101fa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f190611101565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16638a34ffa288848989600081811061024c5761024b611121565b5b90506020020160208101906102619190610fdc565b6040518463ffffffff1660e01b815260040161027f9392919061115f565b600060405180830381600087803b15801561029957600080fd5b505af11580156102ad573d6000803e3d6000fd5b505050505050505050505050565b60006102c98585858561081c565b9050601660030b8114610311576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610308906111e2565b60405180910390fd5b5050505050565b60006103a786868680806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050858580806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050610701565b9050601660030b81146103ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103e690611101565b60405180910390fd5b505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16637c41ad2c60e01b8560405160240161042e9190611202565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610498919061128e565b6000604051808303816000865af19150503d80600081146104d5576040519150601f19603f3d011682016040523d82523d6000602084013e6104da565b606091505b5091509150816104eb576015610500565b808060200190518101906104ff91906112de565b5b60030b92505050919050565b600061051a8585858561093a565b9050601660030b8114610562576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161055990611357565b60405180910390fd5b5050505050565b60006105f888878780806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050868680806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050610701565b9050601660030b8114610640576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161063790611101565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663c3283f4d88848989600081811061069257610691611121565b5b90506020020160208101906106a79190610fdc565b6040518463ffffffff1660e01b81526004016106c59392919061115f565b600060405180830381600087803b1580156106df57600080fd5b505af11580156106f3573d6000803e3d6000fd5b505050505050505050505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166382bba49360e01b87878760405160240161073c939291906114f3565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107a6919061128e565b6000604051808303816000865af19150503d80600081146107e3576040519150601f19603f3d011682016040523d82523d6000602084013e6107e8565b606091505b5091509150816107f957601561080e565b8080602001905181019061080d91906112de565b5b60030b925050509392505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16632c4ba19160e01b888888886040516024016108599493929190611538565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516108c3919061128e565b6000604051808303816000865af19150503d8060008114610900576040519150601f19603f3d011682016040523d82523d6000602084013e610905565b606091505b50915091508161091657601561092b565b8080602001905181019061092a91906112de565b5b60030b92505050949350505050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b8888888860405160240161097794939291906115a1565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109e1919061128e565b6000604051808303816000865af19150503d8060008114610a1e576040519150601f19603f3d011682016040523d82523d6000602084013e610a23565b606091505b509150915081610a34576015610a49565b80806020019051810190610a4891906112de565b5b60030b92505050949350505050565b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610a9782610a6c565b9050919050565b610aa781610a8c565b8114610ab257600080fd5b50565b600081359050610ac481610a9e565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f840112610aef57610aee610aca565b5b8235905067ffffffffffffffff811115610b0c57610b0b610acf565b5b602083019150836020820283011115610b2857610b27610ad4565b5b9250929050565b60008083601f840112610b4557610b44610aca565b5b8235905067ffffffffffffffff811115610b6257610b61610acf565b5b602083019150836020820283011115610b7e57610b7d610ad4565b5b9250929050565b600080600080600080600060a0888a031215610ba457610ba3610a62565b5b6000610bb28a828b01610ab5565b9750506020610bc38a828b01610ab5565b965050604088013567ffffffffffffffff811115610be457610be3610a67565b5b610bf08a828b01610ad9565b9550955050606088013567ffffffffffffffff811115610c1357610c12610a67565b5b610c1f8a828b01610b2f565b93509350506080610c328a828b01610ab5565b91505092959891949750929550565b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610c8a82610c41565b810181811067ffffffffffffffff82111715610ca957610ca8610c52565b5b80604052505050565b6000610cbc610a58565b9050610cc88282610c81565b919050565b600067ffffffffffffffff821115610ce857610ce7610c52565b5b602082029050602081019050919050565b6000610d0c610d0784610ccd565b610cb2565b90508083825260208201905060208402830185811115610d2f57610d2e610ad4565b5b835b81811015610d585780610d448882610ab5565b845260208401935050602081019050610d31565b5050509392505050565b600082601f830112610d7757610d76610aca565b5b8135610d87848260208601610cf9565b91505092915050565b600067ffffffffffffffff821115610dab57610daa610c52565b5b602082029050602081019050919050565b60008160070b9050919050565b610dd281610dbc565b8114610ddd57600080fd5b50565b600081359050610def81610dc9565b92915050565b6000610e08610e0384610d90565b610cb2565b90508083825260208201905060208402830185811115610e2b57610e2a610ad4565b5b835b81811015610e545780610e408882610de0565b845260208401935050602081019050610e2d565b5050509392505050565b600082601f830112610e7357610e72610aca565b5b8135610e83848260208601610df5565b91505092915050565b60008060008060808587031215610ea657610ea5610a62565b5b6000610eb487828801610ab5565b945050602085013567ffffffffffffffff811115610ed557610ed4610a67565b5b610ee187828801610d62565b935050604085013567ffffffffffffffff811115610f0257610f01610a67565b5b610f0e87828801610d62565b925050606085013567ffffffffffffffff811115610f2f57610f2e610a67565b5b610f3b87828801610e5e565b91505092959194509250565b600080600080600060608688031215610f6357610f62610a62565b5b6000610f7188828901610ab5565b955050602086013567ffffffffffffffff811115610f9257610f91610a67565b5b610f9e88828901610ad9565b9450945050604086013567ffffffffffffffff811115610fc157610fc0610a67565b5b610fcd88828901610b2f565b92509250509295509295909350565b600060208284031215610ff257610ff1610a62565b5b600061100084828501610ab5565b91505092915050565b6000819050919050565b61101c81611009565b82525050565b60006020820190506110376000830184611013565b92915050565b6000806000806080858703121561105757611056610a62565b5b600061106587828801610ab5565b945050602061107687828801610ab5565b935050604061108787828801610ab5565b925050606061109887828801610de0565b91505092959194509250565b600082825260208201905092915050565b7f5472616e73666572206f6620746f6b656e73206661696c656400000000000000600082015250565b60006110eb6019836110a4565b91506110f6826110b5565b602082019050919050565b6000602082019050818103600083015261111a816110de565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b61115981610a8c565b82525050565b60006060820190506111746000830186611150565b6111816020830185611150565b61118e6040830184611150565b949350505050565b7f5472616e73666572206f66204e465473206661696c6564000000000000000000600082015250565b60006111cc6017836110a4565b91506111d782611196565b602082019050919050565b600060208201905081810360008301526111fb816111bf565b9050919050565b60006020820190506112176000830184611150565b92915050565b600081519050919050565b600081905092915050565b60005b83811015611251578082015181840152602081019050611236565b60008484015250505050565b60006112688261121d565b6112728185611228565b9350611282818560208601611233565b80840191505092915050565b600061129a828461125d565b915081905092915050565b60008160030b9050919050565b6112bb816112a5565b81146112c657600080fd5b50565b6000815190506112d8816112b2565b92915050565b6000602082840312156112f4576112f3610a62565b5b6000611302848285016112c9565b91505092915050565b7f5472616e73666572206f66204e4654206661696c656400000000000000000000600082015250565b60006113416016836110a4565b915061134c8261130b565b602082019050919050565b6000602082019050818103600083015261137081611334565b9050919050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b6113ac81610a8c565b82525050565b60006113be83836113a3565b60208301905092915050565b6000602082019050919050565b60006113e282611377565b6113ec8185611382565b93506113f783611393565b8060005b8381101561142857815161140f88826113b2565b975061141a836113ca565b9250506001810190506113fb565b5085935050505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61146a81610dbc565b82525050565b600061147c8383611461565b60208301905092915050565b6000602082019050919050565b60006114a082611435565b6114aa8185611440565b93506114b583611451565b8060005b838110156114e65781516114cd8882611470565b97506114d883611488565b9250506001810190506114b9565b5085935050505092915050565b60006060820190506115086000830186611150565b818103602083015261151a81856113d7565b9050818103604083015261152e8184611495565b9050949350505050565b600060808201905061154d6000830187611150565b818103602083015261155f81866113d7565b9050818103604083015261157381856113d7565b905081810360608301526115878184611495565b905095945050505050565b61159b81610dbc565b82525050565b60006080820190506115b66000830187611150565b6115c36020830186611150565b6115d06040830185611150565b6115dd6060830184611592565b9594505050505056fea264697066735822122050516d79897b09cc1393a42ebe2ec8499bdf34b1c28be0cdccb9489ad511b45464736f6c63430008120033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.json b/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.json
deleted file mode 100644
index f7a4e42c5bca..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.json
+++ /dev/null
@@ -1,177 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "feeDistributorContractAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "accounts",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "amounts",
-        "type": "int64[]"
-      }
-    ],
-    "name": "distributeTokens",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeTokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "accounts",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "amounts",
-        "type": "int64[]"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "feeDistributionAfterTransfer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "feeTokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "accounts",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "amounts",
-        "type": "int64[]"
-      },
-      {
-        "internalType": "address",
-        "name": "feeCollector",
-        "type": "address"
-      }
-    ],
-    "name": "feeDistributionAfterTransferStaticNestedCall",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "pauseToken",
-    "outputs": [
-      {
-        "internalType": "int256",
-        "name": "responseCode",
-        "type": "int256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "receiver",
-        "type": "address"
-      },
-      {
-        "internalType": "int64",
-        "name": "serialNum",
-        "type": "int64"
-      }
-    ],
-    "name": "transferNft",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address[]",
-        "name": "sender",
-        "type": "address[]"
-      },
-      {
-        "internalType": "address[]",
-        "name": "receiver",
-        "type": "address[]"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumber",
-        "type": "int64[]"
-      }
-    ],
-    "name": "transferNfts",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.bin
deleted file mode 100644
index 187647677b5c..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50610309806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630ad8f4a1146100515780633af32abf1461006f5780639b19251a1461009f578063e43252d7146100cf575b600080fd5b6100596100eb565b604051610066919061025e565b60405180910390f35b61008960048036038101906100849190610222565b61013e565b604051610096919061025e565b60405180910390f35b6100b960048036038101906100b49190610222565b610193565b6040516100c6919061025e565b60405180910390f35b6100e960048036038101906100e49190610222565b6101b3565b005b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff169050919050565b60006020528060005260406000206000915054906101000a900460ff1681565b60016000808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff02191690831515021790555050565b60008135905061021c816102bc565b92915050565b600060208284031215610238576102376102b7565b5b60006102468482850161020d565b91505092915050565b6102588161028b565b82525050565b6000602082019050610273600083018461024f565b92915050565b600061028482610297565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600080fd5b6102c581610279565b81146102d057600080fd5b5056fea26469706673582212206a5fbc0010d0cbb345b7dddd311a263eba51dc983b64002f761534ea2264776064736f6c63430008070033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.json b/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.json
deleted file mode 100644
index 47144164ecd7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.json
+++ /dev/null
@@ -1,66 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_toBePermitted",
-        "type": "address"
-      }
-    ],
-    "name": "addToWhitelist",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "isSenderWhitelisted",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_toBeChecked",
-        "type": "address"
-      }
-    ],
-    "name": "isWhitelisted",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "whitelist",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.bin
deleted file mode 100644
index 28b34d619064..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5061043a806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806327af24651461003b57806353717295146100f9575b600080fd5b6100f76004803603606081101561005157600080fd5b6001600160a01b03823581169260208101359091169181019060608101604082013564010000000081111561008557600080fd5b82018360208201111561009757600080fd5b803590602001918460208302840111640100000000831117156100b957600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610136945050505050565b005b6100f76004803603606081101561010f57600080fd5b5080356001600160a01b03908116916020810135909116906040013563ffffffff16610193565b60006101438484846101ec565b90506016811461018d576040805162461bcd60e51b815260206004820152601060248201526f4e46542077697065206661696c65642160801b604482015290519081900360640190fd5b50505050565b60006101a0848484610375565b90506016811461018d576040805162461bcd60e51b8152602060048201526012602482015271546f6b656e2077697065206661696c65642160701b604482015290519081900360640190fd5b60008060606101676001600160a01b031663f7f38e2660e01b87878760405160240180846001600160a01b03168152602001836001600160a01b0316815260200180602001828103825283818151815260200191508051906020019060200280838360005b83811015610269578181015183820152602001610251565b50505050905001945050505050604051602081830303815290604052906001600160e01b0319166020820180516001600160e01b0383818316178352505050506040518082805190602001908083835b602083106102d85780518252601f1990920191602091820191016102b9565b6001836020036101000a0380198251168184511680821785525050505050509050019150506000604051808303816000865af19150503d806000811461033a576040519150601f19603f3d011682016040523d82523d6000602084013e61033f565b606091505b509150915081610350576015610368565b80806020019051602081101561036557600080fd5b50515b60030b9695505050505050565b604080516001600160a01b0385811660248301528416604482015263ffffffff831660648083019190915282518083039091018152608490910182526020810180516001600160e01b0316639790686d60e01b1781529151815160009384936060936101679391929091829190808383602083106102d85780518252601f1990920191602091820191016102b956fea2646970667358221220118a3450b823742216102de32032be00fb0bc5d6a7676acb8279ee66137d1bfc64736f6c634300060c0033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.json b/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.json
deleted file mode 100644
index 4a164ff6ba3b..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "uint32",
-        "name": "amount",
-        "type": "uint32"
-      }
-    ],
-    "name": "wipeFungibleToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      },
-      {
-        "internalType": "int64[]",
-        "name": "serialNumbers",
-        "type": "int64[]"
-      }
-    ],
-    "name": "wipeNonFungibleToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.bin
deleted file mode 100644
index 6b29ea41c8f2..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405260016003553480156200001657600080fd5b506040516200140e3803806200140e83398181016040528101906200003c91906200012f565b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505062000176565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620000f782620000ca565b9050919050565b6200010981620000ea565b81146200011557600080fd5b50565b6000815190506200012981620000fe565b92915050565b60008060408385031215620001495762000148620000c5565b5b6000620001598582860162000118565b92505060206200016c8582860162000118565b9150509250929050565b61128880620001866000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063071ddf7e14610051578063b7f2ab651461006f578063d90e0dd21461008b578063dfc984b8146100a9575b600080fd5b6100596100c7565b6040516100669190610999565b60405180910390f35b61008960048036038101906100849190610a01565b6100ff565b005b6100936102d6565b6040516100a09190610999565b60405180910390f35b6100b161030c565b6040516100be9190610a3d565b60405180910390f35b600080610e1062015180426100dc9190610a91565b6100e69190610af1565b9050600e81101580156100f95750601681105b91505090565b8060070b6003541415610158578060070b3373ffffffffffffffffffffffffffffffffffffffff167fbbad3a17d9f4d2d4ee876fb06a580cf445244b1901f27264eb0df0091fb5561760405160405180910390a3610188565b6003547f94aaecc18e4d111e8489d11efe5a7e73e481f272c4e680010ef73fecf90b29f560405160405180910390a25b6003600081548092919061019b90610b2c565b91905055506003548160070b136102be5760006101fc60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1633600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856104a8565b9050601660030b811461020f57506102d3565b6000600167ffffffffffffffff81111561022c5761022b610b75565b5b60405190808252806020026020018201604052801561025a5781602001602082028036833780820191505090505b509050828160008151811061027257610271610ba4565b5b602002602001019060070b908160070b815250506000806102b560008054906101000a900473ffffffffffffffffffffffffffffffffffffffff166000856105c6565b91509150505050505b61012c426102cc9190610bd3565b6002819055505b50565b6000806007600362015180426102ec9190610af1565b6102f69190610bd3565b6103009190610a91565b90506005811091505090565b600080600061038b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff166000600167ffffffffffffffff81111561035257610351610b75565b5b60405190808252806020026020018201604052801561038557816020015b60608152602001906001900390816103705790505b506106ee565b9250509150601660030b82146103a6576000925050506104a5565b60006103d23360008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16610866565b9050601660030b81141580156103ec575060c260030b8114155b156103fd57600093505050506104a5565b600061046860008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16338660008151811061045b5761045a610ba4565b5b60200260200101516104a8565b9050601660030b81146104825760009450505050506104a5565b8260008151811061049657610495610ba4565b5b60200260200101519450505050505b90565b600080600061016773ffffffffffffffffffffffffffffffffffffffff16635cfc901160e01b888888886040516024016104e59493929190610c6a565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161054f9190610d29565b6000604051808303816000865af19150503d806000811461058c576040519150601f19603f3d011682016040523d82523d6000602084013e610591565b606091505b5091509150816105a25760156105b7565b808060200190518101906105b69190610d79565b5b60030b92505050949350505050565b60008060008061016773ffffffffffffffffffffffffffffffffffffffff1663acb9cff960e01b88888860405160240161060293929190610e87565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161066c9190610d29565b6000604051808303816000865af19150503d80600081146106a9576040519150601f19603f3d011682016040523d82523d6000602084013e6106ae565b606091505b5091509150816106c157601560006106d6565b808060200190518101906106d59190610ef1565b5b8160030b915080945081955050505050935093915050565b600080606060008061016773ffffffffffffffffffffffffffffffffffffffff1663278e0b8860e01b89898960405160240161072c9392919061104e565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516107969190610d29565b6000604051808303816000865af19150503d80600081146107d3576040519150601f19603f3d011682016040523d82523d6000602084013e6107d8565b606091505b50915091508161083457601560008067ffffffffffffffff811115610800576107ff610b75565b5b60405190808252806020026020018201604052801561082e5781602001602082028036833780820191505090505b50610849565b8080602001905181019061084891906111ba565b5b8260030b9250809550819650829750505050505093509350939050565b600080600061016773ffffffffffffffffffffffffffffffffffffffff166349146bde60e01b868660405160240161089f929190611229565b604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516109099190610d29565b6000604051808303816000865af19150503d8060008114610946576040519150601f19603f3d011682016040523d82523d6000602084013e61094b565b606091505b50915091508161095c576015610971565b808060200190518101906109709190610d79565b5b60030b9250505092915050565b60008115159050919050565b6109938161097e565b82525050565b60006020820190506109ae600083018461098a565b92915050565b6000604051905090565b600080fd5b600080fd5b60008160070b9050919050565b6109de816109c8565b81146109e957600080fd5b50565b6000813590506109fb816109d5565b92915050565b600060208284031215610a1757610a166109be565b5b6000610a25848285016109ec565b91505092915050565b610a37816109c8565b82525050565b6000602082019050610a526000830184610a2e565b92915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610a9c82610a58565b9150610aa783610a58565b925082610ab757610ab6610a62565b5b828206905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610afc82610a58565b9150610b0783610a58565b925082610b1757610b16610a62565b5b828204905092915050565b6000819050919050565b6000610b3782610b22565b91507f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610b6a57610b69610ac2565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000610bde82610a58565b9150610be983610a58565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff03821115610c1e57610c1d610ac2565b5b828201905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c5482610c29565b9050919050565b610c6481610c49565b82525050565b6000608082019050610c7f6000830187610c5b565b610c8c6020830186610c5b565b610c996040830185610c5b565b610ca66060830184610a2e565b95945050505050565b600081519050919050565b600081905092915050565b60005b83811015610ce3578082015181840152602081019050610cc8565b83811115610cf2576000848401525b50505050565b6000610d0382610caf565b610d0d8185610cba565b9350610d1d818560208601610cc5565b80840191505092915050565b6000610d358284610cf8565b915081905092915050565b60008160030b9050919050565b610d5681610d40565b8114610d6157600080fd5b50565b600081519050610d7381610d4d565b92915050565b600060208284031215610d8f57610d8e6109be565b5b6000610d9d84828501610d64565b91505092915050565b600067ffffffffffffffff82169050919050565b610dc381610da6565b82525050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b610dfe816109c8565b82525050565b6000610e108383610df5565b60208301905092915050565b6000602082019050919050565b6000610e3482610dc9565b610e3e8185610dd4565b9350610e4983610de5565b8060005b83811015610e7a578151610e618882610e04565b9750610e6c83610e1c565b925050600181019050610e4d565b5085935050505092915050565b6000606082019050610e9c6000830186610c5b565b610ea96020830185610dba565b8181036040830152610ebb8184610e29565b9050949350505050565b610ece81610da6565b8114610ed957600080fd5b50565b600081519050610eeb81610ec5565b92915050565b60008060408385031215610f0857610f076109be565b5b6000610f1685828601610d64565b9250506020610f2785828601610edc565b9150509250929050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600082825260208201905092915050565b6000601f19601f8301169050919050565b6000610f8a82610caf565b610f948185610f5d565b9350610fa4818560208601610cc5565b610fad81610f6e565b840191505092915050565b6000610fc48383610f7f565b905092915050565b6000602082019050919050565b6000610fe482610f31565b610fee8185610f3c565b93508360208202850161100085610f4d565b8060005b8581101561103c578484038952815161101d8582610fb8565b945061102883610fcc565b925060208a01995050600181019050611004565b50829750879550505050505092915050565b60006060820190506110636000830186610c5b565b6110706020830185610dba565b81810360408301526110828184610fd9565b9050949350505050565b600080fd5b61109a82610f6e565b810181811067ffffffffffffffff821117156110b9576110b8610b75565b5b80604052505050565b60006110cc6109b4565b90506110d88282611091565b919050565b600067ffffffffffffffff8211156110f8576110f7610b75565b5b602082029050602081019050919050565b600080fd5b60008151905061111d816109d5565b92915050565b6000611136611131846110dd565b6110c2565b9050808382526020820190506020840283018581111561115957611158611109565b5b835b81811015611182578061116e888261110e565b84526020840193505060208101905061115b565b5050509392505050565b600082601f8301126111a1576111a061108c565b5b81516111b1848260208601611123565b91505092915050565b6000806000606084860312156111d3576111d26109be565b5b60006111e186828701610d64565b93505060206111f286828701610edc565b925050604084015167ffffffffffffffff811115611213576112126109c3565b5b61121f8682870161118c565b9150509250925092565b600060408201905061123e6000830185610c5b565b61124b6020830184610c5b565b939250505056fea2646970667358221220a8e3ad26da50d84fd6aaddb1a6793d0ff56cf245cf940b93714519d0ca79cab164736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.json b/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.json
deleted file mode 100644
index e42e894f8ed7..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.json
+++ /dev/null
@@ -1,102 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_treasury",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "served",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "int256",
-        "name": "ticketNumber",
-        "type": "int256"
-      }
-    ],
-    "name": "OrderHandled",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "int256",
-        "name": "ticketNumber",
-        "type": "int256"
-      }
-    ],
-    "name": "OrderSkipped",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "isWorkday",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "workday",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "isWorkingHours",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "workingHours",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "takeTicket",
-    "outputs": [
-      {
-        "internalType": "int64",
-        "name": "serialNumber",
-        "type": "int64"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "int64",
-        "name": "ticketNum",
-        "type": "int64"
-      }
-    ],
-    "name": "workTicket",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.bin b/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.bin
deleted file mode 100644
index ff45169b00da..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b50604051610a4d380380610a4d83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6109ba806100936000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806315dacbea1461005c578063618dc65e146100865780638d8f2adb1461009b5780638f3ea017146100a35780639b23d3d9146100b6575b600080fd5b61006f61006a366004610651565b6100c9565b60405160079190910b815260200160405180910390f35b6100996100943660046106b2565b6101bd565b005b6100996102ab565b6100996100b1366004610774565b610433565b61006f6100c4366004610651565b6104d4565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790630aed65f560e11b9060a4015b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161014891906107ce565b6000604051808303816000865af19150503d8060008114610185576040519150601f19603f3d011682016040523d82523d6000602084013e61018a565b606091505b50915091508161019b5760156101af565b808060200190518101906101af91906107ea565b60030b979650505050505050565b6000806101676001600160a01b031663618dc65e60e01b85856040516024016101e7929190610839565b60408051601f198184030181529181526020820180516001600160e01b03166001600160e01b031990941693909317909252905161022591906107ce565b6000604051808303816000865af19150503d8060008114610262576040519150601f19603f3d011682016040523d82523d6000602084013e610267565b606091505b50915091507f4af4780e06fe8cb9df64b0794fa6f01399af979175bb988e35e0e57e594567bc828260405161029d929190610863565b60405180910390a150505050565b60015442116103015760405162461bcd60e51b815260206004820152601c60248201527f416c72656164792077697468647265772074686973207365636f6e640000000060448201526064015b60405180910390fd5b600080546103199033906001600160a01b0316610519565b90506016811461036b5760405162461bcd60e51b815260206004820152601b60248201527f436f756c64206e6f74206173736f6369617465206163636f756e74000000000060448201526064016102f8565b6000805460028054610396926001600160a01b031691309133916103919160070b610894565b6105ed565b9050601681146103d95760405162461bcd60e51b815260206004820152600e60248201526d11195c1bdcda5d0811985a5b195960921b60448201526064016102f8565b600280546103ea919060070b610894565b600280546000906103ff90849060070b6108e1565b92506101000a81548167ffffffffffffffff021916908360070b67ffffffffffffffff160217905550426001819055505050565b6000805461044c906001600160a01b03163330856105ed565b90506016811461048f5760405162461bcd60e51b815260206004820152600e60248201526d11195c1bdcda5d0811985a5b195960921b60448201526064016102f8565b600280548391906000906104a790849060070b610933565b92506101000a81548167ffffffffffffffff021916908360070b67ffffffffffffffff1602179055505050565b6040516001600160a01b038581166024830152848116604483015283166064820152608481018290526000908190819061016790639b23d3d960e01b9060a40161010a565b604080516001600160a01b038481166024830152831660448083019190915282518083039091018152606490910182526020810180516001600160e01b031663248a35ef60e11b1790529051600091829182916101679161057a91906107ce565b6000604051808303816000865af19150503d80600081146105b7576040519150601f19603f3d011682016040523d82523d6000602084013e6105bc565b606091505b5091509150816105cd5760156105e1565b808060200190518101906105e191906107ea565b60030b95945050505050565b6040516001600160a01b038581166024830152848116604483015283166064820152600782900b6084820152600090819081906101679063eca3691760e01b9060a40161010a565b80356001600160a01b038116811461064c57600080fd5b919050565b6000806000806080858703121561066757600080fd5b61067085610635565b935061067e60208601610635565b925061068c60408601610635565b9396929550929360600135925050565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156106c557600080fd5b6106ce83610635565b9150602083013567ffffffffffffffff808211156106eb57600080fd5b818501915085601f8301126106ff57600080fd5b8135818111156107115761071161069c565b604051601f8201601f19908116603f011681019083821181831017156107395761073961069c565b8160405282815288602084870101111561075257600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561078657600080fd5b81358060070b811461079757600080fd5b9392505050565b60005b838110156107b95781810151838201526020016107a1565b838111156107c8576000848401525b50505050565b600082516107e081846020870161079e565b9190910192915050565b6000602082840312156107fc57600080fd5b81518060030b811461079757600080fd5b6000815180845261082581602086016020860161079e565b601f01601f19169290920160200192915050565b6001600160a01b038316815260406020820152600061085b604083018461080d565b949350505050565b821515815260406020820152600061085b604083018461080d565b634e487b7160e01b600052601160045260246000fd5b60008160070b8360070b806108b957634e487b7160e01b600052601260045260246000fd5b677fffffffffffffff198214600019821416156108d8576108d861087e565b90059392505050565b60008160070b8360070b6000811281677fffffffffffffff190183128115161561090d5761090d61087e565b81677fffffffffffffff0183138116156109295761092961087e565b5090039392505050565b60008160070b8360070b6000821282677fffffffffffffff0382138115161561095e5761095e61087e565b82677fffffffffffffff1903821281161561097b5761097b61087e565b5001939250505056fea2646970667358221220fd34d780fee9d381e572901090d3338e746d596343169cea629f592b09a66ecf64736f6c63430008090033
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.json b/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.json
deleted file mode 100644
index 37f18be74717..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_tokenAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "int64",
-        "name": "amount",
-        "type": "int64"
-      }
-    ],
-    "name": "depositTokens",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "withdrawTokens",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/how-to-compile-contracts.txt b/hedera-node/test-clients/src/main/resource/contract/contracts/how-to-compile-contracts.txt
deleted file mode 100644
index 66948164a478..000000000000
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/how-to-compile-contracts.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-From .sol get .bin and .json - commit all 3:
-
-solc --evm-version cancun --overwrite --bin --abi -o . --pretty-json  CONTRACT-NAME-HERE.sol
-mv -f CONTRACT-NAME-HERE.abi CONTRACT-NAME-HERE.json
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.sol b/hedera-node/test-clients/src/main/solidity/AbandoningParent/AbandoningParent.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AbandoningParent/AbandoningParent.sol
rename to hedera-node/test-clients/src/main/solidity/AbandoningParent/AbandoningParent.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.sol b/hedera-node/test-clients/src/main/solidity/AddressBook/AddressBook.sol
similarity index 98%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.sol
rename to hedera-node/test-clients/src/main/solidity/AddressBook/AddressBook.sol
index a1810208abaa..0268b0d67047 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressBook/AddressBook.sol
+++ b/hedera-node/test-clients/src/main/solidity/AddressBook/AddressBook.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.24;
 
-import "./SafeMath.sol";
+import "../SafeMath/SafeMath.sol";
 
 library AddressBook {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.sol b/hedera-node/test-clients/src/main/solidity/AddressValueRet/AddressValueRet.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AddressValueRet/AddressValueRet.sol
rename to hedera-node/test-clients/src/main/solidity/AddressValueRet/AddressValueRet.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.sol b/hedera-node/test-clients/src/main/solidity/AliasedOperator/AliasedOperator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AliasedOperator/AliasedOperator.sol
rename to hedera-node/test-clients/src/main/solidity/AliasedOperator/AliasedOperator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.sol b/hedera-node/test-clients/src/main/solidity/AliasedTransfer/AliasedTransfer.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AliasedTransfer/AliasedTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/AliasedTransfer/AliasedTransfer.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.sol b/hedera-node/test-clients/src/main/solidity/ApproveByDelegateCall/ApproveByDelegateCall.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ApproveByDelegateCall/ApproveByDelegateCall.sol
rename to hedera-node/test-clients/src/main/solidity/ApproveByDelegateCall/ApproveByDelegateCall.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.sol b/hedera-node/test-clients/src/main/solidity/AssociateDissociate/AssociateDissociate.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.sol
rename to hedera-node/test-clients/src/main/solidity/AssociateDissociate/AssociateDissociate.sol
index 9cd27ed7e7dd..f387b6582a9a 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateDissociate/AssociateDissociate.sol
+++ b/hedera-node/test-clients/src/main/solidity/AssociateDissociate/AssociateDissociate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract AssociateDissociateContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.sol b/hedera-node/test-clients/src/main/solidity/AssociateTryCatch/AssociateTryCatch.sol
similarity index 75%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.sol
rename to hedera-node/test-clients/src/main/solidity/AssociateTryCatch/AssociateTryCatch.sol
index 65848a449649..c84a08ec78f3 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AssociateTryCatch/AssociateTryCatch.sol
+++ b/hedera-node/test-clients/src/main/solidity/AssociateTryCatch/AssociateTryCatch.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./CalledContract.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../CalledContract/CalledContract.sol";
 
 
 contract AssociateTryCatch is HederaTokenService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.sol b/hedera-node/test-clients/src/main/solidity/Associator/Associator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Associator/Associator.sol
rename to hedera-node/test-clients/src/main/solidity/Associator/Associator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AssortedXTest/AssortedXTest.sol b/hedera-node/test-clients/src/main/solidity/AssortedXTest/AssortedXTest.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AssortedXTest/AssortedXTest.sol
rename to hedera-node/test-clients/src/main/solidity/AssortedXTest/AssortedXTest.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.abi b/hedera-node/test-clients/src/main/solidity/AtomicCryptoTransfer/AtomicCryptoTransfer.abi
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.abi
rename to hedera-node/test-clients/src/main/solidity/AtomicCryptoTransfer/AtomicCryptoTransfer.abi
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.sol b/hedera-node/test-clients/src/main/solidity/AtomicCryptoTransfer/AtomicCryptoTransfer.sol
similarity index 80%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/AtomicCryptoTransfer/AtomicCryptoTransfer.sol
index a3c5d3346164..abc58fe3e6e5 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AtomicCryptoTransfer/AtomicCryptoTransfer.sol
+++ b/hedera-node/test-clients/src/main/solidity/AtomicCryptoTransfer/AtomicCryptoTransfer.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.5.0 <0.9.0;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
 
 contract CryptoTransferV2 is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.sol b/hedera-node/test-clients/src/main/solidity/AutoCreationModes/AutoCreationModes.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.sol
rename to hedera-node/test-clients/src/main/solidity/AutoCreationModes/AutoCreationModes.sol
index e12e6295984e..2fca854d1da6 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/AutoCreationModes/AutoCreationModes.sol
+++ b/hedera-node/test-clients/src/main/solidity/AutoCreationModes/AutoCreationModes.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./hip-206/IHederaTokenService.sol";
+import "../hip-206/IHederaTokenService.sol";
 
 contract AutoCreationModes {
     event Log(string message);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.sol b/hedera-node/test-clients/src/main/solidity/BadRelayClient/BadRelayClient.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.sol
rename to hedera-node/test-clients/src/main/solidity/BadRelayClient/BadRelayClient.sol
index 9d9b3e36417c..9560319f722b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BadRelayClient/BadRelayClient.sol
+++ b/hedera-node/test-clients/src/main/solidity/BadRelayClient/BadRelayClient.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./FeeHelper.sol";
+import "../FeeHelper/FeeHelper.sol";
 
 contract BadRelayClient is FeeHelper {
     function stealFrom(address haplessRelayer, address exploitTokenAddress) public payable {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.sol b/hedera-node/test-clients/src/main/solidity/BalanceChecker/BalanceChecker.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker/BalanceChecker.sol
rename to hedera-node/test-clients/src/main/solidity/BalanceChecker/BalanceChecker.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.sol b/hedera-node/test-clients/src/main/solidity/BalanceChecker46Version/BalanceChecker46Version.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BalanceChecker46Version/BalanceChecker46Version.sol
rename to hedera-node/test-clients/src/main/solidity/BalanceChecker46Version/BalanceChecker46Version.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.sol b/hedera-node/test-clients/src/main/solidity/BalanceLookup/BalanceLookup.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BalanceLookup/BalanceLookup.sol
rename to hedera-node/test-clients/src/main/solidity/BalanceLookup/BalanceLookup.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.sol b/hedera-node/test-clients/src/main/solidity/Benchmark/Benchmark.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Benchmark/Benchmark.sol
rename to hedera-node/test-clients/src/main/solidity/Benchmark/Benchmark.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BigArray/BigArray.sol b/hedera-node/test-clients/src/main/solidity/BigArray/BigArray.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BigArray/BigArray.sol
rename to hedera-node/test-clients/src/main/solidity/BigArray/BigArray.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.sol b/hedera-node/test-clients/src/main/solidity/BigBig/BigBig.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BigBig/BigBig.sol
rename to hedera-node/test-clients/src/main/solidity/BigBig/BigBig.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.sol b/hedera-node/test-clients/src/main/solidity/BurnToken/BurnToken.sol
similarity index 87%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.sol
rename to hedera-node/test-clients/src/main/solidity/BurnToken/BurnToken.sol
index 07dfb74fbc14..9af874feed5c 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/BurnToken/BurnToken.sol
+++ b/hedera-node/test-clients/src/main/solidity/BurnToken/BurnToken.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
-import "../../solidity/hip-206/HederaTokenService.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract BurnToken is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.sol b/hedera-node/test-clients/src/main/solidity/CallInConstructor/CallInConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CallInConstructor/CallInConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/CallInConstructor/CallInConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.sol b/hedera-node/test-clients/src/main/solidity/CallOperationsChecker/CallOperationsChecker.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsChecker/CallOperationsChecker.sol
rename to hedera-node/test-clients/src/main/solidity/CallOperationsChecker/CallOperationsChecker.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.sol b/hedera-node/test-clients/src/main/solidity/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.sol
rename to hedera-node/test-clients/src/main/solidity/CallOperationsCheckerSuccess/CallOperationsCheckerSuccess.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.sol b/hedera-node/test-clients/src/main/solidity/CalldataSize/CalldataSize.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CalldataSize/CalldataSize.sol
rename to hedera-node/test-clients/src/main/solidity/CalldataSize/CalldataSize.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.sol b/hedera-node/test-clients/src/main/solidity/CalledContract/CalledContract.sol
similarity index 63%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.sol
rename to hedera-node/test-clients/src/main/solidity/CalledContract/CalledContract.sol
index a1589e81681f..407aded69f79 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CalledContract/CalledContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/CalledContract/CalledContract.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract CalledContract is HederaTokenService {
     function associate(address account, address tokenAddress) external {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.sol b/hedera-node/test-clients/src/main/solidity/CallingContract/CallingContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CallingContract/CallingContract.sol
rename to hedera-node/test-clients/src/main/solidity/CallingContract/CallingContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.sol b/hedera-node/test-clients/src/main/solidity/ChainIdUser/ChainIdUser.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ChainIdUser/ChainIdUser.sol
rename to hedera-node/test-clients/src/main/solidity/ChainIdUser/ChainIdUser.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.sol b/hedera-node/test-clients/src/main/solidity/ChildStorage/ChildStorage.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ChildStorage/ChildStorage.sol
rename to hedera-node/test-clients/src/main/solidity/ChildStorage/ChildStorage.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.sol b/hedera-node/test-clients/src/main/solidity/CircularTransfers/CircularTransfers.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CircularTransfers/CircularTransfers.sol
rename to hedera-node/test-clients/src/main/solidity/CircularTransfers/CircularTransfers.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ClassicQueriesXTest/ClassicQueriesXTest.sol b/hedera-node/test-clients/src/main/solidity/ClassicQueriesXTest/ClassicQueriesXTest.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ClassicQueriesXTest/ClassicQueriesXTest.sol
rename to hedera-node/test-clients/src/main/solidity/ClassicQueriesXTest/ClassicQueriesXTest.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.sol b/hedera-node/test-clients/src/main/solidity/ConsTimeRepro/ConsTimeRepro.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.sol
rename to hedera-node/test-clients/src/main/solidity/ConsTimeRepro/ConsTimeRepro.sol
index b1c336ca3cc7..114a624f8349 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsTimeRepro/ConsTimeRepro.sol
+++ b/hedera-node/test-clients/src/main/solidity/ConsTimeRepro/ConsTimeRepro.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity 0.8.16;
 
-import "./hip-206/HederaTokenService.sol";
+import "../hip-206/HederaTokenService.sol";
 
 /*
 * @dev Minimal contract that validates consensus times are still 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.sol b/hedera-node/test-clients/src/main/solidity/ConsValueEthPrecompile/ConsValueEthPrecompile.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueEthPrecompile/ConsValueEthPrecompile.sol
rename to hedera-node/test-clients/src/main/solidity/ConsValueEthPrecompile/ConsValueEthPrecompile.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.sol b/hedera-node/test-clients/src/main/solidity/ConsValueSysContract/ConsValueSysContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ConsValueSysContract/ConsValueSysContract.sol
rename to hedera-node/test-clients/src/main/solidity/ConsValueSysContract/ConsValueSysContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.sol b/hedera-node/test-clients/src/main/solidity/Create2Factory/Create2Factory.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Create2Factory/Create2Factory.sol
rename to hedera-node/test-clients/src/main/solidity/Create2Factory/Create2Factory.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.sol b/hedera-node/test-clients/src/main/solidity/Create2MultipleCreates/Create2MultipleCreates.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Create2MultipleCreates/Create2MultipleCreates.sol
rename to hedera-node/test-clients/src/main/solidity/Create2MultipleCreates/Create2MultipleCreates.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.sol b/hedera-node/test-clients/src/main/solidity/Create2PrecompileUser/Create2PrecompileUser.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.sol
rename to hedera-node/test-clients/src/main/solidity/Create2PrecompileUser/Create2PrecompileUser.sol
index 542f93a0c1a4..e4c1bbafce8b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2PrecompileUser/Create2PrecompileUser.sol
+++ b/hedera-node/test-clients/src/main/solidity/Create2PrecompileUser/Create2PrecompileUser.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.9;
 
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract Create2PrecompileUser is HederaTokenService {
     User user;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.sol b/hedera-node/test-clients/src/main/solidity/Create2SelfDestructContract/Create2SelfDestructContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Create2SelfDestructContract/Create2SelfDestructContract.sol
rename to hedera-node/test-clients/src/main/solidity/Create2SelfDestructContract/Create2SelfDestructContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.sol b/hedera-node/test-clients/src/main/solidity/Create2User/Create2User.sol
similarity index 87%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.sol
rename to hedera-node/test-clients/src/main/solidity/Create2User/Create2User.sol
index ed6306c77c8c..a4ef3ea772be 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Create2User/Create2User.sol
+++ b/hedera-node/test-clients/src/main/solidity/Create2User/Create2User.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.9;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract Create2User is HederaTokenService {
     function associateTo(address token_type) public {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.sol b/hedera-node/test-clients/src/main/solidity/CreateDonor/CreateDonor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CreateDonor/CreateDonor.sol
rename to hedera-node/test-clients/src/main/solidity/CreateDonor/CreateDonor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.sol b/hedera-node/test-clients/src/main/solidity/CreateIndirectly/CreateIndirectly.sol
similarity index 87%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.sol
rename to hedera-node/test-clients/src/main/solidity/CreateIndirectly/CreateIndirectly.sol
index 23189dd598d5..ae70b2b0320d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateIndirectly/CreateIndirectly.sol
+++ b/hedera-node/test-clients/src/main/solidity/CreateIndirectly/CreateIndirectly.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.9;
-import "./ToyMaker.sol";
+import "../ToyMaker/ToyMaker.sol";
 
 contract CreateIndirectly {
     function makeOpaquely(address makerAddress) public returns (address) {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.sol b/hedera-node/test-clients/src/main/solidity/CreateTrivial/CreateTrivial.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CreateTrivial/CreateTrivial.sol
rename to hedera-node/test-clients/src/main/solidity/CreateTrivial/CreateTrivial.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.sol b/hedera-node/test-clients/src/main/solidity/Creator/Creator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Creator/Creator.sol
rename to hedera-node/test-clients/src/main/solidity/Creator/Creator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.sol b/hedera-node/test-clients/src/main/solidity/CryptoKitties/CryptoKitties.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CryptoKitties/CryptoKitties.sol
rename to hedera-node/test-clients/src/main/solidity/CryptoKitties/CryptoKitties.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.sol b/hedera-node/test-clients/src/main/solidity/CryptoTransfer/CryptoTransfer.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/CryptoTransfer/CryptoTransfer.sol
index 184abb2ca14d..f04d67a02192 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/CryptoTransfer/CryptoTransfer.sol
+++ b/hedera-node/test-clients/src/main/solidity/CryptoTransfer/CryptoTransfer.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract CryptoTransfer is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.sol b/hedera-node/test-clients/src/main/solidity/DelegateContract/DelegateContract.sol
similarity index 83%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.sol
rename to hedera-node/test-clients/src/main/solidity/DelegateContract/DelegateContract.sol
index adc27c9b7f7d..1fb767a4eaae 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DelegateContract/DelegateContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/DelegateContract/DelegateContract.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./ServiceContract.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../ServiceContract/ServiceContract.sol";
 
 contract DelegateContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.sol b/hedera-node/test-clients/src/main/solidity/DeleteTokenContract/DeleteTokenContract.sol
similarity index 79%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.sol
rename to hedera-node/test-clients/src/main/solidity/DeleteTokenContract/DeleteTokenContract.sol
index 7bfa685609a4..de20d29d0dd1 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DeleteTokenContract/DeleteTokenContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/DeleteTokenContract/DeleteTokenContract.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract DeleteTokenContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.sol b/hedera-node/test-clients/src/main/solidity/DirectPrecompileCallee/DirectPrecompileCallee.sol
similarity index 87%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.sol
rename to hedera-node/test-clients/src/main/solidity/DirectPrecompileCallee/DirectPrecompileCallee.sol
index 4f8397f35b3f..15bc3572cce0 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DirectPrecompileCallee/DirectPrecompileCallee.sol
+++ b/hedera-node/test-clients/src/main/solidity/DirectPrecompileCallee/DirectPrecompileCallee.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./hip-206/IHederaTokenService.sol";
+import "../hip-206/IHederaTokenService.sol";
 
 contract DirectPrecompileCallee {
     address HTS_ADDRESS = address(0x167);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.sol b/hedera-node/test-clients/src/main/solidity/DoTokenManagement/DoTokenManagement.sol
similarity index 99%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.sol
rename to hedera-node/test-clients/src/main/solidity/DoTokenManagement/DoTokenManagement.sol
index f63a48b6c3dc..3bee2b3b3411 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/DoTokenManagement/DoTokenManagement.sol
+++ b/hedera-node/test-clients/src/main/solidity/DoTokenManagement/DoTokenManagement.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./hip-206/IHederaTokenService.sol";
+import "../hip-206/IHederaTokenService.sol";
 
 contract DoTokenManagement {
     address HTS_ADDRESS = address(0x167);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.sol b/hedera-node/test-clients/src/main/solidity/Donor/Donor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Donor/Donor.sol
rename to hedera-node/test-clients/src/main/solidity/Donor/Donor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.sol b/hedera-node/test-clients/src/main/solidity/DoubleSend/DoubleSend.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/DoubleSend/DoubleSend.sol
rename to hedera-node/test-clients/src/main/solidity/DoubleSend/DoubleSend.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.sol b/hedera-node/test-clients/src/main/solidity/ERC20Contract/ERC20Contract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ERC20Contract/ERC20Contract.sol
rename to hedera-node/test-clients/src/main/solidity/ERC20Contract/ERC20Contract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.sol b/hedera-node/test-clients/src/main/solidity/ERC20DelegateCallee/ERC20DelegateCallee.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.sol
rename to hedera-node/test-clients/src/main/solidity/ERC20DelegateCallee/ERC20DelegateCallee.sol
index 072759b1adda..d9ece73b55d2 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC20DelegateCallee/ERC20DelegateCallee.sol
+++ b/hedera-node/test-clients/src/main/solidity/ERC20DelegateCallee/ERC20DelegateCallee.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./IERC20.sol";
+import "../IERC20/IERC20.sol";
 
 contract ERC20DelegateCallee {
     function doIndirectApproval(address _token, address _attacker) external  {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.sol b/hedera-node/test-clients/src/main/solidity/ERC721Contract/ERC721Contract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Contract/ERC721Contract.sol
rename to hedera-node/test-clients/src/main/solidity/ERC721Contract/ERC721Contract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol b/hedera-node/test-clients/src/main/solidity/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol
rename to hedera-node/test-clients/src/main/solidity/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol
index b204cc5bee4f..48395c42f320 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol
+++ b/hedera-node/test-clients/src/main/solidity/ERC721ContractWithHTSCalls/ERC721ContractWithHTSCalls.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol";
 import "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.sol b/hedera-node/test-clients/src/main/solidity/ERC721Full/ERC721Full.sol
similarity index 94%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.sol
rename to hedera-node/test-clients/src/main/solidity/ERC721Full/ERC721Full.sol
index f859bb1d118a..02ff0aa0d1b0 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ERC721Full/ERC721Full.sol
+++ b/hedera-node/test-clients/src/main/solidity/ERC721Full/ERC721Full.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.16;
 
-import "./ERC721.sol";
+import "../ERC721/ERC721.sol";
 
 /**
  * @title Full ERC721 Token
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.sol b/hedera-node/test-clients/src/main/solidity/EmitBlockTimestamp/EmitBlockTimestamp.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmitBlockTimestamp/EmitBlockTimestamp.sol
rename to hedera-node/test-clients/src/main/solidity/EmitBlockTimestamp/EmitBlockTimestamp.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitEvent/EmitEvent.sol b/hedera-node/test-clients/src/main/solidity/EmitEvent/EmitEvent.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmitEvent/EmitEvent.sol
rename to hedera-node/test-clients/src/main/solidity/EmitEvent/EmitEvent.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.sol b/hedera-node/test-clients/src/main/solidity/EmitSenderOrigin/EmitSenderOrigin.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmitSenderOrigin/EmitSenderOrigin.sol
rename to hedera-node/test-clients/src/main/solidity/EmitSenderOrigin/EmitSenderOrigin.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.sol b/hedera-node/test-clients/src/main/solidity/EmptyConstructor/EmptyConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmptyConstructor/EmptyConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/EmptyConstructor/EmptyConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.sol b/hedera-node/test-clients/src/main/solidity/EmptyOne/EmptyOne.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmptyOne/EmptyOne.sol
rename to hedera-node/test-clients/src/main/solidity/EmptyOne/EmptyOne.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.sol b/hedera-node/test-clients/src/main/solidity/EmptyTwo/EmptyTwo.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/EmptyTwo/EmptyTwo.sol
rename to hedera-node/test-clients/src/main/solidity/EmptyTwo/EmptyTwo.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol b/hedera-node/test-clients/src/main/solidity/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol
similarity index 88%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol
rename to hedera-node/test-clients/src/main/solidity/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol
index 8f773682c4fb..e650e5e5f4f9 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol
+++ b/hedera-node/test-clients/src/main/solidity/ErcAndHtsAlternatives/ErcAndHtsAlternatives.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./IERC721.sol";
-import "./IERC721Metadata.sol";
-import "./hip-206/IHederaTokenService.sol";
+import "../IERC721/IERC721.sol";
+import "../IERC721Metadata/IERC721Metadata.sol";
+import "../hip-206/IHederaTokenService.sol";
 
 contract ErcAndHtsAlternatives {
     address constant HTS_ENTRY_POINT = address(0x167);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.sol b/hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/ExchangeRatePrecompile.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.sol
rename to hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/ExchangeRatePrecompile.sol
index 4a4845dfa57d..5480a4d9bdff 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/ExchangeRatePrecompile.sol
+++ b/hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/ExchangeRatePrecompile.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.5.0 <0.9.0;
 
-import "./SelfFunding.sol";
+import "../SelfFunding/SelfFunding.sol";
 
 contract ExchangeRatePrecompile is SelfFunding {
     // The USD in cents that must be sent as msg.value
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/IExchangeRate.sol b/hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/IExchangeRate.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/IExchangeRate.sol
rename to hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/IExchangeRate.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/SelfFunding.sol b/hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/SelfFunding.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/SelfFunding.sol
rename to hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/SelfFunding.sol
index 3823050ae7bc..63749ab885b0 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ExchangeRatePrecompile/SelfFunding.sol
+++ b/hedera-node/test-clients/src/main/solidity/ExchangeRatePrecompile/SelfFunding.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.5.0 <0.9.0;
 
-import "./IExchangeRate.sol";
+import "../IExchangeRate/IExchangeRate.sol";
 
 abstract contract SelfFunding {
     uint256 constant TINY_PARTS_PER_WHOLE = 100_000_000;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.sol b/hedera-node/test-clients/src/main/solidity/ExtCodeOperationsChecker/ExtCodeOperationsChecker.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ExtCodeOperationsChecker/ExtCodeOperationsChecker.sol
rename to hedera-node/test-clients/src/main/solidity/ExtCodeOperationsChecker/ExtCodeOperationsChecker.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.sol b/hedera-node/test-clients/src/main/solidity/FactoryContract/FactoryContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FactoryContract/FactoryContract.sol
rename to hedera-node/test-clients/src/main/solidity/FactoryContract/FactoryContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.sol b/hedera-node/test-clients/src/main/solidity/FactoryMirror/FactoryMirror.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FactoryMirror/FactoryMirror.sol
rename to hedera-node/test-clients/src/main/solidity/FactoryMirror/FactoryMirror.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.sol b/hedera-node/test-clients/src/main/solidity/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.sol
rename to hedera-node/test-clients/src/main/solidity/FactoryQuickSelfDestruct/FactoryQuickSelfDestruct.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.sol b/hedera-node/test-clients/src/main/solidity/FactorySelfDestructConstructor/FactorySelfDestructConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FactorySelfDestructConstructor/FactorySelfDestructConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/FactorySelfDestructConstructor/FactorySelfDestructConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.sol b/hedera-node/test-clients/src/main/solidity/FailableClassicCalls/FailableClassicCalls.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FailableClassicCalls/FailableClassicCalls.sol
rename to hedera-node/test-clients/src/main/solidity/FailableClassicCalls/FailableClassicCalls.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.sol b/hedera-node/test-clients/src/main/solidity/FeeDistributor/FeeDistributor.sol
similarity index 73%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.sol
rename to hedera-node/test-clients/src/main/solidity/FeeDistributor/FeeDistributor.sol
index 8224845bf764..ed4275e854ac 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeDistributor/FeeDistributor.sol
+++ b/hedera-node/test-clients/src/main/solidity/FeeDistributor/FeeDistributor.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract FeeDistributor is HederaTokenService {
     function distributeFees(address tokenAddress, address feeCollector, address receiver) external {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/FeeHelper.sol b/hedera-node/test-clients/src/main/solidity/FeeHelper/FeeHelper.sol.TODO
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/FeeHelper.sol
rename to hedera-node/test-clients/src/main/solidity/FeeHelper/FeeHelper.sol.TODO
index 5a7ec6645277..c9672720589d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/FeeHelper.sol
+++ b/hedera-node/test-clients/src/main/solidity/FeeHelper/FeeHelper.sol.TODO
@@ -2,10 +2,10 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./IHederaTokenService.sol";
-import "./KeyHelper.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../KeyHelper/KeyHelper.sol";
 
 contract FeeHelper is KeyHelper {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.sol b/hedera-node/test-clients/src/main/solidity/FibonacciPlus/FibonacciPlus.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FibonacciPlus/FibonacciPlus.sol
rename to hedera-node/test-clients/src/main/solidity/FibonacciPlus/FibonacciPlus.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.sol b/hedera-node/test-clients/src/main/solidity/FinalizedDestructible/FinalizedDestructible.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FinalizedDestructible/FinalizedDestructible.sol
rename to hedera-node/test-clients/src/main/solidity/FinalizedDestructible/FinalizedDestructible.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.sol b/hedera-node/test-clients/src/main/solidity/FreezeUnfreezeContract/FreezeUnfreezeContract.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.sol
rename to hedera-node/test-clients/src/main/solidity/FreezeUnfreezeContract/FreezeUnfreezeContract.sol
index 71d19b1a7fbb..d124eb96bda2 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FreezeUnfreezeContract/FreezeUnfreezeContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/FreezeUnfreezeContract/FreezeUnfreezeContract.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract FreezeUnfreezeContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.sol b/hedera-node/test-clients/src/main/solidity/Fuse/Fuse.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Fuse/Fuse.sol
rename to hedera-node/test-clients/src/main/solidity/Fuse/Fuse.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.sol b/hedera-node/test-clients/src/main/solidity/GLDToken/GLDToken.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GLDToken/GLDToken.sol
rename to hedera-node/test-clients/src/main/solidity/GLDToken/GLDToken.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.sol b/hedera-node/test-clients/src/main/solidity/GameItem/GameItem.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GameItem/GameItem.sol
rename to hedera-node/test-clients/src/main/solidity/GameItem/GameItem.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.sol b/hedera-node/test-clients/src/main/solidity/GameItems/GameItems.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GameItems/GameItems.sol
rename to hedera-node/test-clients/src/main/solidity/GameItems/GameItems.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.sol b/hedera-node/test-clients/src/main/solidity/GlobalProperties/GlobalProperties.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GlobalProperties/GlobalProperties.sol
rename to hedera-node/test-clients/src/main/solidity/GlobalProperties/GlobalProperties.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.sol b/hedera-node/test-clients/src/main/solidity/GracefullyFailing/GracefullyFailing.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.sol
rename to hedera-node/test-clients/src/main/solidity/GracefullyFailing/GracefullyFailing.sol
index 52741045a0e4..2d9a3ad6948d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailing/GracefullyFailing.sol
+++ b/hedera-node/test-clients/src/main/solidity/GracefullyFailing/GracefullyFailing.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract GracefullyFailingContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.sol b/hedera-node/test-clients/src/main/solidity/GracefullyFailingPrng/GracefullyFailingPrng.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GracefullyFailingPrng/GracefullyFailingPrng.sol
rename to hedera-node/test-clients/src/main/solidity/GracefullyFailingPrng/GracefullyFailingPrng.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.sol b/hedera-node/test-clients/src/main/solidity/GrantRevokeKyc/GrantRevokeKyc.sol
similarity index 80%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.sol
rename to hedera-node/test-clients/src/main/solidity/GrantRevokeKyc/GrantRevokeKyc.sol
index 1ff2bf41cde1..1ad936becd2b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/GrantRevokeKyc/GrantRevokeKyc.sol
+++ b/hedera-node/test-clients/src/main/solidity/GrantRevokeKyc/GrantRevokeKyc.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract GrantRevokeKyc is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.sol b/hedera-node/test-clients/src/main/solidity/GrowArray/GrowArray.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/GrowArray/GrowArray.sol
rename to hedera-node/test-clients/src/main/solidity/GrowArray/GrowArray.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.sol b/hedera-node/test-clients/src/main/solidity/HRC/HRC.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HRC/HRC.sol
rename to hedera-node/test-clients/src/main/solidity/HRC/HRC.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.sol b/hedera-node/test-clients/src/main/solidity/HRC632Contract/HRC632Contract.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.sol
rename to hedera-node/test-clients/src/main/solidity/HRC632Contract/HRC632Contract.sol
index 22b4479ee274..6e31a82b2d30 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HRC632Contract.sol
+++ b/hedera-node/test-clients/src/main/solidity/HRC632Contract/HRC632Contract.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 import "./HederaAccountService.sol";
 import "./IHederaAccountService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract HRC632Contract is HederaAccountService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HederaAccountService.sol b/hedera-node/test-clients/src/main/solidity/HRC632Contract/HederaAccountService.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HederaAccountService.sol
rename to hedera-node/test-clients/src/main/solidity/HRC632Contract/HederaAccountService.sol
index 5093cb2fb2cb..ea4f19a7cbd4 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/HederaAccountService.sol
+++ b/hedera-node/test-clients/src/main/solidity/HRC632Contract/HederaAccountService.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 import "./IHederaAccountService.sol";
 
 abstract contract HederaAccountService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/IHederaAccountService.sol b/hedera-node/test-clients/src/main/solidity/HRC632Contract/IHederaAccountService.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HRC632Contract/IHederaAccountService.sol
rename to hedera-node/test-clients/src/main/solidity/HRC632Contract/IHederaAccountService.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.sol b/hedera-node/test-clients/src/main/solidity/HRCContract/HRCContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HRCContract/HRCContract.sol
rename to hedera-node/test-clients/src/main/solidity/HRCContract/HRCContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.sol b/hedera-node/test-clients/src/main/solidity/HTSCalls/HTSCalls.sol
similarity index 71%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.sol
rename to hedera-node/test-clients/src/main/solidity/HTSCalls/HTSCalls.sol
index 3a1d077bd2d9..f645fa482321 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HTSCalls/HTSCalls.sol
+++ b/hedera-node/test-clients/src/main/solidity/HTSCalls/HTSCalls.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract HTSCalls is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.sol b/hedera-node/test-clients/src/main/solidity/HbarFeeCollector/HbarFeeCollector.sol
similarity index 79%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.sol
rename to hedera-node/test-clients/src/main/solidity/HbarFeeCollector/HbarFeeCollector.sol
index 5acc16a4d4fc..92db2491fd05 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HbarFeeCollector/HbarFeeCollector.sol
+++ b/hedera-node/test-clients/src/main/solidity/HbarFeeCollector/HbarFeeCollector.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./HederaTokenService.sol";
-import "./NestedHTSTransferrer.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../NestedHTSTransferrer/NestedHTSTransferrer.sol";
 
 contract HbarFeeCollector is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.sol b/hedera-node/test-clients/src/main/solidity/HelloWorldMint/HelloWorldMint.sol
similarity index 85%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.sol
rename to hedera-node/test-clients/src/main/solidity/HelloWorldMint/HelloWorldMint.sol
index abac7b7e5561..34b1b9b2a29d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HelloWorldMint/HelloWorldMint.sol
+++ b/hedera-node/test-clients/src/main/solidity/HelloWorldMint/HelloWorldMint.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract HelloWorldMint is HederaResponseCodes {
     address constant precompileAddress = address(0x167);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.sol b/hedera-node/test-clients/src/main/solidity/HollowAccountCreator/HollowAccountCreator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HollowAccountCreator/HollowAccountCreator.sol
rename to hedera-node/test-clients/src/main/solidity/HollowAccountCreator/HollowAccountCreator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.sol b/hedera-node/test-clients/src/main/solidity/HtsApproveAllowance/HtsApproveAllowance.sol
similarity index 87%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.sol
rename to hedera-node/test-clients/src/main/solidity/HtsApproveAllowance/HtsApproveAllowance.sol
index ac1b0040d3b7..2383fbb29030 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsApproveAllowance/HtsApproveAllowance.sol
+++ b/hedera-node/test-clients/src/main/solidity/HtsApproveAllowance/HtsApproveAllowance.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract HtsApproveAllowance is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.sol b/hedera-node/test-clients/src/main/solidity/HtsTransferFrom/HtsTransferFrom.sol
similarity index 76%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.sol
rename to hedera-node/test-clients/src/main/solidity/HtsTransferFrom/HtsTransferFrom.sol
index d38d4b005df7..07fc079be1c9 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/HtsTransferFrom/HtsTransferFrom.sol
+++ b/hedera-node/test-clients/src/main/solidity/HtsTransferFrom/HtsTransferFrom.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract HtsTransferFrom is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.sol b/hedera-node/test-clients/src/main/solidity/IHRC632/IHRC632.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/IHRC632/IHRC632.sol
rename to hedera-node/test-clients/src/main/solidity/IHRC632/IHRC632.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.sol b/hedera-node/test-clients/src/main/solidity/IHederaTokenService/IHederaTokenService.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/IHederaTokenService/IHederaTokenService.sol
rename to hedera-node/test-clients/src/main/solidity/IHederaTokenService/IHederaTokenService.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.sol b/hedera-node/test-clients/src/main/solidity/ImmediateChildAssociation/ImmediateChildAssociation.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.sol
rename to hedera-node/test-clients/src/main/solidity/ImmediateChildAssociation/ImmediateChildAssociation.sol
index d73223fdbcb4..ed9e31598d94 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ImmediateChildAssociation/ImmediateChildAssociation.sol
+++ b/hedera-node/test-clients/src/main/solidity/ImmediateChildAssociation/ImmediateChildAssociation.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract ImmediateChildAssociation is HederaTokenService {
     constructor(address tokenAddr) {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.sol b/hedera-node/test-clients/src/main/solidity/InlineTest/InlineTest.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/InlineTest/InlineTest.sol
rename to hedera-node/test-clients/src/main/solidity/InlineTest/InlineTest.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.sol b/hedera-node/test-clients/src/main/solidity/InstantStorageHog/InstantStorageHog.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.sol
rename to hedera-node/test-clients/src/main/solidity/InstantStorageHog/InstantStorageHog.sol
index aeddbb2c1b11..f0d7b5efbf54 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/InstantStorageHog/InstantStorageHog.sol
+++ b/hedera-node/test-clients/src/main/solidity/InstantStorageHog/InstantStorageHog.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.9;
 
-import "./hip-206/HederaTokenService.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract InstantStorageHog is HederaTokenService {
     uint256[] private stuff;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.sol b/hedera-node/test-clients/src/main/solidity/InternalCallee/InternalCallee.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/InternalCallee/InternalCallee.sol
rename to hedera-node/test-clients/src/main/solidity/InternalCallee/InternalCallee.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.sol b/hedera-node/test-clients/src/main/solidity/InternalCaller/InternalCaller.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/InternalCaller/InternalCaller.sol
rename to hedera-node/test-clients/src/main/solidity/InternalCaller/InternalCaller.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.sol b/hedera-node/test-clients/src/main/solidity/Jurisdictions/Jurisdictions.sol
similarity index 99%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.sol
rename to hedera-node/test-clients/src/main/solidity/Jurisdictions/Jurisdictions.sol
index 12af7dad8373..dc37400f1832 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Jurisdictions/Jurisdictions.sol
+++ b/hedera-node/test-clients/src/main/solidity/Jurisdictions/Jurisdictions.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "./Ownable.sol";
-import "./SafeMath.sol";
+import "../Ownable/Ownable.sol";
+import "../SafeMath/SafeMath.sol";
 
 
 /// @title Jurisdictions
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.sol b/hedera-node/test-clients/src/main/solidity/JustSend/JustSend.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/JustSend/JustSend.sol
rename to hedera-node/test-clients/src/main/solidity/JustSend/JustSend.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.sol b/hedera-node/test-clients/src/main/solidity/KeyHelper/KeyHelper.sol.TODO
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.sol
rename to hedera-node/test-clients/src/main/solidity/KeyHelper/KeyHelper.sol.TODO
index eab68b1a345e..2d925213b9db 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/KeyHelper/KeyHelper.sol
+++ b/hedera-node/test-clients/src/main/solidity/KeyHelper/KeyHelper.sol.TODO
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract KeyHelper is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.sol b/hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfers/LazyPrecompileTransfers.sol
similarity index 90%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.sol
rename to hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfers/LazyPrecompileTransfers.sol
index 330d85a074ab..04afc3f7eaa1 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfers/LazyPrecompileTransfers.sol
+++ b/hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfers/LazyPrecompileTransfers.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract LazyPrecompileTransfers is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol b/hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol
rename to hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol
index a6d7acf932ad..3546626173e2 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol
+++ b/hedera-node/test-clients/src/main/solidity/LazyPrecompileTransfersAtomic/LazyPrecompileTransfersAtomic.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract LazyPrecompileTransfersV2 is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.sol b/hedera-node/test-clients/src/main/solidity/LowLevelCall/LowLevelCall.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/LowLevelCall/LowLevelCall.sol
rename to hedera-node/test-clients/src/main/solidity/LowLevelCall/LowLevelCall.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.sol b/hedera-node/test-clients/src/main/solidity/MakeCalls/MakeCalls.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MakeCalls/MakeCalls.sol
rename to hedera-node/test-clients/src/main/solidity/MakeCalls/MakeCalls.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.sol b/hedera-node/test-clients/src/main/solidity/ManyChildren/ManyChildren.sol
similarity index 90%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.sol
rename to hedera-node/test-clients/src/main/solidity/ManyChildren/ManyChildren.sol
index 19a48fe2f41d..b8b1f658b51b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ManyChildren/ManyChildren.sol
+++ b/hedera-node/test-clients/src/main/solidity/ManyChildren/ManyChildren.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./hip-206/HederaTokenService.sol";
-import "./IERC20.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../IERC20/IERC20.sol";
 
 contract ManyChildren is HederaTokenService {
     function checkBalanceRepeatedly(address token, address account, uint timesToCheck) external {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.sol b/hedera-node/test-clients/src/main/solidity/MinimalTokenCreations/MinimalTokenCreations.sol
similarity index 98%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.sol
rename to hedera-node/test-clients/src/main/solidity/MinimalTokenCreations/MinimalTokenCreations.sol
index 408ef37e9e9d..2b66331c8243 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MinimalTokenCreations/MinimalTokenCreations.sol
+++ b/hedera-node/test-clients/src/main/solidity/MinimalTokenCreations/MinimalTokenCreations.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./hip-206/KeyHelper.sol";
-import "./hip-206/HederaTokenService.sol";
+import "../hip-206/KeyHelper.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract MinimalTokenCreations is KeyHelper {
     uint32 decimals = 1;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.sol b/hedera-node/test-clients/src/main/solidity/MintContract/MintContract.sol
similarity index 94%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.sol
rename to hedera-node/test-clients/src/main/solidity/MintContract/MintContract.sol
index 08b44f262307..70d28dbea368 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintContract/MintContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/MintContract/MintContract.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract MintContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.sol b/hedera-node/test-clients/src/main/solidity/MintNFTContract/MintNFTContract.sol
similarity index 80%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.sol
rename to hedera-node/test-clients/src/main/solidity/MintNFTContract/MintNFTContract.sol
index 902cce558142..323bb4dbfa6f 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintNFTContract/MintNFTContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/MintNFTContract/MintNFTContract.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract MintNFTContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.sol b/hedera-node/test-clients/src/main/solidity/MintToken/MintToken.sol
similarity index 68%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.sol
rename to hedera-node/test-clients/src/main/solidity/MintToken/MintToken.sol
index a2e5669cd172..a5e58148491b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MintToken/MintToken.sol
+++ b/hedera-node/test-clients/src/main/solidity/MintToken/MintToken.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract MintTokenContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.sol b/hedera-node/test-clients/src/main/solidity/Minters/Minters.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.sol
rename to hedera-node/test-clients/src/main/solidity/Minters/Minters.sol
index 131057266954..169f1f86567f 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/Minters/Minters.sol
+++ b/hedera-node/test-clients/src/main/solidity/Minters/Minters.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "./Ownable.sol";
-import "./SafeMath.sol";
-import "./AddressBook.sol";
-import "./Jurisdictions.sol";
+import "../Ownable/Ownable.sol";
+import "../SafeMath/SafeMath.sol";
+import "../AddressBook/AddressBook.sol";
+import "../Jurisdictions/Jurisdictions.sol";
 
 
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.sol b/hedera-node/test-clients/src/main/solidity/MixedBurnToken/MixedBurnToken.sol
similarity index 81%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.sol
rename to hedera-node/test-clients/src/main/solidity/MixedBurnToken/MixedBurnToken.sol
index 833604b6bb78..cd1c0921ffd2 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedBurnToken/MixedBurnToken.sol
+++ b/hedera-node/test-clients/src/main/solidity/MixedBurnToken/MixedBurnToken.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract MixedBurnToken is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.sol b/hedera-node/test-clients/src/main/solidity/MixedFramesScenarios/MixedFramesScenarios.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.sol
rename to hedera-node/test-clients/src/main/solidity/MixedFramesScenarios/MixedFramesScenarios.sol
index aedd3e897f14..5a186eaaeb28 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedFramesScenarios/MixedFramesScenarios.sol
+++ b/hedera-node/test-clients/src/main/solidity/MixedFramesScenarios/MixedFramesScenarios.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract MixedFramesScenarios is HederaResponseCodes {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.sol b/hedera-node/test-clients/src/main/solidity/MixedMintToken/MixedMintToken.sol
similarity index 88%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.sol
rename to hedera-node/test-clients/src/main/solidity/MixedMintToken/MixedMintToken.sol
index deb739f87c35..12fcdbfd56ed 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/MixedMintToken/MixedMintToken.sol
+++ b/hedera-node/test-clients/src/main/solidity/MixedMintToken/MixedMintToken.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract MixedMintTokenContract is HederaResponseCodes {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.sol b/hedera-node/test-clients/src/main/solidity/Module050OpcodesExist/Module050OpcodesExist.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Module050OpcodesExist/Module050OpcodesExist.sol
rename to hedera-node/test-clients/src/main/solidity/Module050OpcodesExist/Module050OpcodesExist.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.sol b/hedera-node/test-clients/src/main/solidity/Multipurpose/Multipurpose.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Multipurpose/Multipurpose.sol
rename to hedera-node/test-clients/src/main/solidity/Multipurpose/Multipurpose.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.sol b/hedera-node/test-clients/src/main/solidity/MultiversionBurn/MultiversionBurn.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MultiversionBurn/MultiversionBurn.sol
rename to hedera-node/test-clients/src/main/solidity/MultiversionBurn/MultiversionBurn.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.sol b/hedera-node/test-clients/src/main/solidity/MusicalChairs/MusicalChairs.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/MusicalChairs/MusicalChairs.sol
rename to hedera-node/test-clients/src/main/solidity/MusicalChairs/MusicalChairs.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.sol b/hedera-node/test-clients/src/main/solidity/NegativeAssociationsContract/NegativeAssociationsContract.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.sol
rename to hedera-node/test-clients/src/main/solidity/NegativeAssociationsContract/NegativeAssociationsContract.sol
index 0e093de79ec5..0232553d2960 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeAssociationsContract/NegativeAssociationsContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NegativeAssociationsContract/NegativeAssociationsContract.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract NegativeAssociationsContract is HederaTokenService {
     address private invalidAddress = 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.sol b/hedera-node/test-clients/src/main/solidity/NegativeBurnContract/NegativeBurnContract.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.sol
rename to hedera-node/test-clients/src/main/solidity/NegativeBurnContract/NegativeBurnContract.sol
index 63d94a5b13c4..81044101cba4 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeBurnContract/NegativeBurnContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NegativeBurnContract/NegativeBurnContract.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract NegativeBurnContract is HederaTokenService{
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.sol b/hedera-node/test-clients/src/main/solidity/NegativeDissociationsContract/NegativeDissociationsContract.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.sol
rename to hedera-node/test-clients/src/main/solidity/NegativeDissociationsContract/NegativeDissociationsContract.sol
index 5b6b9d16c859..dcb8703b9543 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeDissociationsContract/NegativeDissociationsContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NegativeDissociationsContract/NegativeDissociationsContract.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract NegativeDissociationsContract is HederaTokenService {
     address private invalidAddress = 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF;
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol b/hedera-node/test-clients/src/main/solidity/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol
similarity index 86%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol
rename to hedera-node/test-clients/src/main/solidity/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol
index 2ae1c538b0a8..259098021c9c 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol
+++ b/hedera-node/test-clients/src/main/solidity/NegativeHtsTransferFrom/NegativeHtsTransferFrom.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract NegativeHtsTransferFrom is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.sol b/hedera-node/test-clients/src/main/solidity/NegativeMintContract/NegativeMintContract.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.sol
rename to hedera-node/test-clients/src/main/solidity/NegativeMintContract/NegativeMintContract.sol
index 57c612d5d72d..931f0c66aeb0 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NegativeMintContract/NegativeMintContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NegativeMintContract/NegativeMintContract.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract NegativeMintContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.sol b/hedera-node/test-clients/src/main/solidity/NestedAssociateDissociate/NestedAssociateDissociate.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.sol
rename to hedera-node/test-clients/src/main/solidity/NestedAssociateDissociate/NestedAssociateDissociate.sol
index e10038a351db..04d2e51e00ce 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedAssociateDissociate/NestedAssociateDissociate.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedAssociateDissociate/NestedAssociateDissociate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract NestedAssociateDissociate is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.sol b/hedera-node/test-clients/src/main/solidity/NestedBurn/NestedBurn.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.sol
rename to hedera-node/test-clients/src/main/solidity/NestedBurn/NestedBurn.sol
index aa247f08bd66..a9510a38dfa9 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedBurn/NestedBurn.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedBurn/NestedBurn.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 import "../MintToken/MintToken.sol";
 
 contract NestedBurn is HederaTokenService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.sol b/hedera-node/test-clients/src/main/solidity/NestedChildren/NestedChildren.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedChildren/NestedChildren.sol
rename to hedera-node/test-clients/src/main/solidity/NestedChildren/NestedChildren.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.sol b/hedera-node/test-clients/src/main/solidity/NestedCreations/NestedCreations.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedCreations/NestedCreations.sol
rename to hedera-node/test-clients/src/main/solidity/NestedCreations/NestedCreations.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.sol b/hedera-node/test-clients/src/main/solidity/NestedERC20Contract/NestedERC20Contract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedERC20Contract/NestedERC20Contract.sol
rename to hedera-node/test-clients/src/main/solidity/NestedERC20Contract/NestedERC20Contract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.sol b/hedera-node/test-clients/src/main/solidity/NestedHTSTransferrer/NestedHTSTransferrer.sol
similarity index 68%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.sol
rename to hedera-node/test-clients/src/main/solidity/NestedHTSTransferrer/NestedHTSTransferrer.sol
index 9fe5a0cb88b6..6173e929dfbb 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedHTSTransferrer/NestedHTSTransferrer.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedHTSTransferrer/NestedHTSTransferrer.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract NestedHTSTransferrer is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.sol b/hedera-node/test-clients/src/main/solidity/NestedLazyCreateContract/NestedLazyCreateContract.sol
similarity index 86%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.sol
rename to hedera-node/test-clients/src/main/solidity/NestedLazyCreateContract/NestedLazyCreateContract.sol
index 54eb381e2118..68500db07b54 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateContract/NestedLazyCreateContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedLazyCreateContract/NestedLazyCreateContract.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract NestedLazyCreateContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.sol b/hedera-node/test-clients/src/main/solidity/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/NestedLazyCreateViaConstructor/NestedLazyCreateViaConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.sol b/hedera-node/test-clients/src/main/solidity/NestedMint/NestedMint.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.sol
rename to hedera-node/test-clients/src/main/solidity/NestedMint/NestedMint.sol
index 7ee9933b2027..7633f7667930 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedMint/NestedMint.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedMint/NestedMint.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./MintNFTContract.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../MintNFTContract/MintNFTContract.sol";
 
 contract NestedMintContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.sol b/hedera-node/test-clients/src/main/solidity/NestedTransferContract/NestedTransferContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferContract/NestedTransferContract.sol
rename to hedera-node/test-clients/src/main/solidity/NestedTransferContract/NestedTransferContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.sol b/hedera-node/test-clients/src/main/solidity/NestedTransferringContract/NestedTransferringContract.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.sol
rename to hedera-node/test-clients/src/main/solidity/NestedTransferringContract/NestedTransferringContract.sol
index a39c91a80818..b2bf0170e1e8 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NestedTransferringContract/NestedTransferringContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NestedTransferringContract/NestedTransferringContract.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.5.0;
 
-import "./NestedContract1.sol";
-import "./NestedContract2.sol";
+import "../NestedContract1/NestedContract1.sol";
+import "../NestedContract2/NestedContract2.sol";
 
 contract NestedTransferringContract {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.sol b/hedera-node/test-clients/src/main/solidity/NewTokenCreateContract/NewTokenCreateContract.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.sol
rename to hedera-node/test-clients/src/main/solidity/NewTokenCreateContract/NewTokenCreateContract.sol
index dfb137430765..9ae1a3bf78f5 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NewTokenCreateContract/NewTokenCreateContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/NewTokenCreateContract/NewTokenCreateContract.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./ExpiryHelper.sol";
-import "./KeyHelper.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../ExpiryHelper/ExpiryHelper.sol";
+import "../KeyHelper/KeyHelper.sol";
 
 contract TokenCreateContract is HederaTokenService, ExpiryHelper, KeyHelper {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.sol b/hedera-node/test-clients/src/main/solidity/NonDelegateCallee/NonDelegateCallee.sol
similarity index 86%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.sol
rename to hedera-node/test-clients/src/main/solidity/NonDelegateCallee/NonDelegateCallee.sol
index e286d3ca5e35..d24ce40786bc 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCallee/NonDelegateCallee.sol
+++ b/hedera-node/test-clients/src/main/solidity/NonDelegateCallee/NonDelegateCallee.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./IERC20.sol";
+import "../IERC20/IERC20.sol";
 
 contract NonDelegateCallee {
     function doIndirectApproval(address _token, address _attacker) external  {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol b/hedera-node/test-clients/src/main/solidity/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol
index a722b25e1df2..d129b4bedbba 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol
+++ b/hedera-node/test-clients/src/main/solidity/NonDelegateCryptoTransfer/NonDelegateCryptoTransfer.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./hip-206/HederaTokenService.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract NonDelegateCryptoTransfer is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.sol b/hedera-node/test-clients/src/main/solidity/NoncesExternalization/NoncesExternalization.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/NoncesExternalization/NoncesExternalization.sol
rename to hedera-node/test-clients/src/main/solidity/NoncesExternalization/NoncesExternalization.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.sol b/hedera-node/test-clients/src/main/solidity/OpcodesContract/OpcodesContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/OpcodesContract.sol
rename to hedera-node/test-clients/src/main/solidity/OpcodesContract/OpcodesContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/recompile.sh b/hedera-node/test-clients/src/main/solidity/OpcodesContract/recompile.sh
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/OpcodesContract/recompile.sh
rename to hedera-node/test-clients/src/main/solidity/OpcodesContract/recompile.sh
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.sol b/hedera-node/test-clients/src/main/solidity/OuterCreator/OuterCreator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/OuterCreator/OuterCreator.sol
rename to hedera-node/test-clients/src/main/solidity/OuterCreator/OuterCreator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.sol b/hedera-node/test-clients/src/main/solidity/OwnershipCheck/OwnershipCheck.sol
similarity index 64%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.sol
rename to hedera-node/test-clients/src/main/solidity/OwnershipCheck/OwnershipCheck.sol
index b22ab238bfa1..b1a16cffaae8 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/OwnershipCheck/OwnershipCheck.sol
+++ b/hedera-node/test-clients/src/main/solidity/OwnershipCheck/OwnershipCheck.sol
@@ -1,7 +1,7 @@
 pragma solidity =0.8.15;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
 
 // SPDX-License-Identifier: MIT
 contract OwnershipCheck is HederaTokenService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.sol b/hedera-node/test-clients/src/main/solidity/ParentChildTransfer/ParentChildTransfer.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ParentChildTransfer/ParentChildTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/ParentChildTransfer/ParentChildTransfer.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol b/hedera-node/test-clients/src/main/solidity/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol
similarity index 72%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol
rename to hedera-node/test-clients/src/main/solidity/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol
index c1e2ebe133f6..d5a915456921 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol
+++ b/hedera-node/test-clients/src/main/solidity/PauseUnpauseTokenAccount/PauseUnpauseTokenAccount.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract PauseUnpauseTokenAccount is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.sol b/hedera-node/test-clients/src/main/solidity/PayReceivable/PayReceivable.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PayReceivable/PayReceivable.sol
rename to hedera-node/test-clients/src/main/solidity/PayReceivable/PayReceivable.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.sol b/hedera-node/test-clients/src/main/solidity/PayableConstructor/PayableConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PayableConstructor/PayableConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/PayableConstructor/PayableConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.sol b/hedera-node/test-clients/src/main/solidity/PayableCreate2Deploy/PayableCreate2Deploy.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PayableCreate2Deploy/PayableCreate2Deploy.sol
rename to hedera-node/test-clients/src/main/solidity/PayableCreate2Deploy/PayableCreate2Deploy.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.sol b/hedera-node/test-clients/src/main/solidity/PrecompileAliasXfer/PrecompileAliasXfer.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.sol
rename to hedera-node/test-clients/src/main/solidity/PrecompileAliasXfer/PrecompileAliasXfer.sol
index b45e1bca5d69..6f4e4161c2be 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileAliasXfer/PrecompileAliasXfer.sol
+++ b/hedera-node/test-clients/src/main/solidity/PrecompileAliasXfer/PrecompileAliasXfer.sol
@@ -2,10 +2,10 @@
 pragma solidity >=0.6.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./IERC20.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../IERC20/IERC20.sol";
 
 contract NestedCalls is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.sol b/hedera-node/test-clients/src/main/solidity/PrecompileCaller/PrecompileCaller.sol
similarity index 68%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.sol
rename to hedera-node/test-clients/src/main/solidity/PrecompileCaller/PrecompileCaller.sol
index c083cffe9a57..6c3387384c6c 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrecompileCaller/PrecompileCaller.sol
+++ b/hedera-node/test-clients/src/main/solidity/PrecompileCaller/PrecompileCaller.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract PrecompileCaller is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.sol b/hedera-node/test-clients/src/main/solidity/PretendCallee/PretendCallee.sol
similarity index 81%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.sol
rename to hedera-node/test-clients/src/main/solidity/PretendCallee/PretendCallee.sol
index 37e9ca5c7a60..c99712f72121 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendCallee/PretendCallee.sol
+++ b/hedera-node/test-clients/src/main/solidity/PretendCallee/PretendCallee.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.8.0;
 
-import "./IERC20.sol";
-import "./hip-206/IHederaTokenService.sol";
+import "../IERC20/IERC20.sol";
+import "../hip-206/IHederaTokenService.sol";
 
 contract PretendCallee {
     address HTS_ADDRESS = address(0x167);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.sol b/hedera-node/test-clients/src/main/solidity/PretendPair/PretendPair.sol
similarity index 81%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.sol
rename to hedera-node/test-clients/src/main/solidity/PretendPair/PretendPair.sol
index 4e2345294233..8e08e43fddf6 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PretendPair/PretendPair.sol
+++ b/hedera-node/test-clients/src/main/solidity/PretendPair/PretendPair.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./PretendCallee.sol";
+import "../PretendCallee/PretendCallee.sol";
 
 contract PretendPair {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.sol b/hedera-node/test-clients/src/main/solidity/PrngSeedOperationContract/PrngSeedOperationContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PrngSeedOperationContract/PrngSeedOperationContract.sol
rename to hedera-node/test-clients/src/main/solidity/PrngSeedOperationContract/PrngSeedOperationContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/IPrngSystemContract.sol b/hedera-node/test-clients/src/main/solidity/PrngSystemContract/IPrngSystemContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/IPrngSystemContract.sol
rename to hedera-node/test-clients/src/main/solidity/PrngSystemContract/IPrngSystemContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.sol b/hedera-node/test-clients/src/main/solidity/PrngSystemContract/PrngSystemContract.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.sol
rename to hedera-node/test-clients/src/main/solidity/PrngSystemContract/PrngSystemContract.sol
index 7cba17b3b15f..c0d6e6cbd97d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/PrngSystemContract/PrngSystemContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/PrngSystemContract/PrngSystemContract.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import "./IPrngSystemContract.sol";
+import "../PrngSystemContract/IPrngSystemContract.sol";
 
 contract PrngSystemContract {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.sol b/hedera-node/test-clients/src/main/solidity/RedirectNullContract/RedirectNullContract.sol
similarity index 78%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.sol
rename to hedera-node/test-clients/src/main/solidity/RedirectNullContract/RedirectNullContract.sol
index 2465426dd03b..5d0149d78a5c 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectNullContract/RedirectNullContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/RedirectNullContract/RedirectNullContract.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract RedirectNullContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.sol b/hedera-node/test-clients/src/main/solidity/RedirectTestContract/RedirectTestContract.sol
similarity index 82%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.sol
rename to hedera-node/test-clients/src/main/solidity/RedirectTestContract/RedirectTestContract.sol
index 2136197be13d..b201ab3cb573 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/RedirectTestContract/RedirectTestContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/RedirectTestContract/RedirectTestContract.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 contract RedirectTestContract is HederaTokenService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.sol b/hedera-node/test-clients/src/main/solidity/Returner/Returner.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Returner/Returner.sol
rename to hedera-node/test-clients/src/main/solidity/Returner/Returner.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.sol b/hedera-node/test-clients/src/main/solidity/ReverterConstructor/ReverterConstructor.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructor/ReverterConstructor.sol
rename to hedera-node/test-clients/src/main/solidity/ReverterConstructor/ReverterConstructor.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.sol b/hedera-node/test-clients/src/main/solidity/ReverterConstructorTransfer/ReverterConstructorTransfer.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ReverterConstructorTransfer/ReverterConstructorTransfer.sol
rename to hedera-node/test-clients/src/main/solidity/ReverterConstructorTransfer/ReverterConstructorTransfer.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.sol b/hedera-node/test-clients/src/main/solidity/RevertingContract/RevertingContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/RevertingContract/RevertingContract.sol
rename to hedera-node/test-clients/src/main/solidity/RevertingContract/RevertingContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.sol b/hedera-node/test-clients/src/main/solidity/RevertingCreateFactory/RevertingCreateFactory.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/RevertingCreateFactory/RevertingCreateFactory.sol
rename to hedera-node/test-clients/src/main/solidity/RevertingCreateFactory/RevertingCreateFactory.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.sol b/hedera-node/test-clients/src/main/solidity/RevertingSendTry/RevertingSendTry.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/RevertingSendTry/RevertingSendTry.sol
rename to hedera-node/test-clients/src/main/solidity/RevertingSendTry/RevertingSendTry.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.sol b/hedera-node/test-clients/src/main/solidity/SafeOperations/SafeOperations.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.sol
rename to hedera-node/test-clients/src/main/solidity/SafeOperations/SafeOperations.sol
index c02e8fdc05d1..0af590383bbf 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SafeOperations/SafeOperations.sol
+++ b/hedera-node/test-clients/src/main/solidity/SafeOperations/SafeOperations.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./SafeHederaTokenService.sol";
+import "../SafeHederaTokenService/SafeHederaTokenService.sol";
 
 contract SafeOperationsContract is SafeHederaTokenService {
     function safeTokenAssociate(address sender, address tokenAddress) external {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.sol b/hedera-node/test-clients/src/main/solidity/SaltingCreator/SaltingCreator.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreator/SaltingCreator.sol
rename to hedera-node/test-clients/src/main/solidity/SaltingCreator/SaltingCreator.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.sol b/hedera-node/test-clients/src/main/solidity/SaltingCreatorFactory/SaltingCreatorFactory.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SaltingCreatorFactory/SaltingCreatorFactory.sol
rename to hedera-node/test-clients/src/main/solidity/SaltingCreatorFactory/SaltingCreatorFactory.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.sol b/hedera-node/test-clients/src/main/solidity/SelfAssociating/SelfAssociating.sol
similarity index 81%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.sol
rename to hedera-node/test-clients/src/main/solidity/SelfAssociating/SelfAssociating.sol
index d4f8ad737216..a41a2b1270a7 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfAssociating/SelfAssociating.sol
+++ b/hedera-node/test-clients/src/main/solidity/SelfAssociating/SelfAssociating.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract SelfAssociating is HederaTokenService {
     constructor(address tokenAddr) {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.sol b/hedera-node/test-clients/src/main/solidity/SelfDestructCallable/SelfDestructCallable.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SelfDestructCallable/SelfDestructCallable.sol
rename to hedera-node/test-clients/src/main/solidity/SelfDestructCallable/SelfDestructCallable.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.sol b/hedera-node/test-clients/src/main/solidity/SendInternalAndDelegate/SendInternalAndDelegate.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SendInternalAndDelegate/SendInternalAndDelegate.sol
rename to hedera-node/test-clients/src/main/solidity/SendInternalAndDelegate/SendInternalAndDelegate.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.sol b/hedera-node/test-clients/src/main/solidity/ServiceContract/ServiceContract.sol
similarity index 83%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.sol
rename to hedera-node/test-clients/src/main/solidity/ServiceContract/ServiceContract.sol
index 5d667839f7ad..490b94c05e8d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ServiceContract/ServiceContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/ServiceContract/ServiceContract.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract ServiceContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.sol b/hedera-node/test-clients/src/main/solidity/SimpleStorage/SimpleStorage.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SimpleStorage/SimpleStorage.sol
rename to hedera-node/test-clients/src/main/solidity/SimpleStorage/SimpleStorage.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.sol b/hedera-node/test-clients/src/main/solidity/SimpleUpdate/SimpleUpdate.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SimpleUpdate/SimpleUpdate.sol
rename to hedera-node/test-clients/src/main/solidity/SimpleUpdate/SimpleUpdate.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.sol b/hedera-node/test-clients/src/main/solidity/SlotUser/SlotUser.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SlotUser/SlotUser.sol
rename to hedera-node/test-clients/src/main/solidity/SlotUser/SlotUser.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.sol b/hedera-node/test-clients/src/main/solidity/SomeERC20Scenarios/SomeERC20Scenarios.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.sol
rename to hedera-node/test-clients/src/main/solidity/SomeERC20Scenarios/SomeERC20Scenarios.sol
index 29c1332ef096..7af6f770214f 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC20Scenarios/SomeERC20Scenarios.sol
+++ b/hedera-node/test-clients/src/main/solidity/SomeERC20Scenarios/SomeERC20Scenarios.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "./hip-206/HederaTokenService.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract SomeERC20Scenarios {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.sol b/hedera-node/test-clients/src/main/solidity/SomeERC721Scenarios/SomeERC721Scenarios.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.sol
rename to hedera-node/test-clients/src/main/solidity/SomeERC721Scenarios/SomeERC721Scenarios.sol
index bf32bc199cd7..ed697635ec7e 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SomeERC721Scenarios/SomeERC721Scenarios.sol
+++ b/hedera-node/test-clients/src/main/solidity/SomeERC721Scenarios/SomeERC721Scenarios.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./ERC721/IERC721.sol";
-import "./hip-206/HederaTokenService.sol";
+import "../ERC721/IERC721/ERC721/IERC721.sol";
+import "../hip-206/HederaTokenService.sol";
 
 contract SomeERC721Scenarios is HederaTokenService {
     function iMustOwnAfterReceiving(
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.sol b/hedera-node/test-clients/src/main/solidity/SpecialQueriesXTest/SpecialQueriesXTest.sol
similarity index 91%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.sol
rename to hedera-node/test-clients/src/main/solidity/SpecialQueriesXTest/SpecialQueriesXTest.sol
index d3b59d545b7d..6c7fad003d91 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/SpecialQueriesXTest/SpecialQueriesXTest.sol
+++ b/hedera-node/test-clients/src/main/solidity/SpecialQueriesXTest/SpecialQueriesXTest.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
-import "./IERC20.sol";
-import "./IERC721.sol";
-import "./IERC20Metadata.sol";
-import "./IERC721Metadata.sol";
-import "./IExchangeRate.sol";
-import "./IPrngSystemContract.sol";
+import "../IERC20/IERC20.sol";
+import "../IERC721/IERC721.sol";
+import "../IERC20Metadata/IERC20Metadata.sol";
+import "../IERC721Metadata/IERC721Metadata.sol";
+import "../IExchangeRate/IExchangeRate.sol";
+import "../PrngSystemContract/IPrngSystemContract.sol";
 
 contract SpecialQueriesXTest {
     address constant XRATE_ADDRESS = address(0x168);
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.sol b/hedera-node/test-clients/src/main/solidity/StateContract/StateContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/StateContract/StateContract.sol
rename to hedera-node/test-clients/src/main/solidity/StateContract/StateContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.sol b/hedera-node/test-clients/src/main/solidity/StaticContract/StaticContract.sol
similarity index 83%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.sol
rename to hedera-node/test-clients/src/main/solidity/StaticContract/StaticContract.sol
index 46e762fb5a7a..462246150671 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/StaticContract/StaticContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/StaticContract/StaticContract.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./ServiceContract.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../ServiceContract/ServiceContract.sol";
 
 contract StaticContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.sol b/hedera-node/test-clients/src/main/solidity/SubLevelTransferring/SubLevelTransferring.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/SubLevelTransferring/SubLevelTransferring.sol
rename to hedera-node/test-clients/src/main/solidity/SubLevelTransferring/SubLevelTransferring.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.sol b/hedera-node/test-clients/src/main/solidity/TemporarySStoreRefund/TemporarySStoreRefund.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TemporarySStoreRefund/TemporarySStoreRefund.sol
rename to hedera-node/test-clients/src/main/solidity/TemporarySStoreRefund/TemporarySStoreRefund.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.sol b/hedera-node/test-clients/src/main/solidity/TestApprover/TestApprover.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TestApprover/TestApprover.sol
rename to hedera-node/test-clients/src/main/solidity/TestApprover/TestApprover.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.sol b/hedera-node/test-clients/src/main/solidity/TestContract/TestContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TestContract/TestContract.sol
rename to hedera-node/test-clients/src/main/solidity/TestContract/TestContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.sol b/hedera-node/test-clients/src/main/solidity/TestTokenCreateContract/TestTokenCreateContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TestTokenCreateContract/TestTokenCreateContract.sol
rename to hedera-node/test-clients/src/main/solidity/TestTokenCreateContract/TestTokenCreateContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.sol b/hedera-node/test-clients/src/main/solidity/ThreeSlots/ThreeSlots.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ThreeSlots/ThreeSlots.sol
rename to hedera-node/test-clients/src/main/solidity/ThreeSlots/ThreeSlots.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.sol b/hedera-node/test-clients/src/main/solidity/TokenAndTypeCheck/TokenAndTypeCheck.sol
similarity index 75%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.sol
rename to hedera-node/test-clients/src/main/solidity/TokenAndTypeCheck/TokenAndTypeCheck.sol
index f3b6cf97e05e..042866018ee8 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenAndTypeCheck/TokenAndTypeCheck.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenAndTypeCheck/TokenAndTypeCheck.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract TokenAndTypeCheck is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.sol b/hedera-node/test-clients/src/main/solidity/TokenCreateContract/FeeHelper.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.sol
rename to hedera-node/test-clients/src/main/solidity/TokenCreateContract/FeeHelper.sol
index 5a7ec6645277..32c864419b4f 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/FeeHelper/FeeHelper.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenCreateContract/FeeHelper.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
 import "./KeyHelper.sol";
 
 contract FeeHelper is KeyHelper {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/KeyHelper.sol b/hedera-node/test-clients/src/main/solidity/TokenCreateContract/KeyHelper.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/KeyHelper.sol
rename to hedera-node/test-clients/src/main/solidity/TokenCreateContract/KeyHelper.sol
index eab68b1a345e..2d925213b9db 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/KeyHelper.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenCreateContract/KeyHelper.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract KeyHelper is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.sol b/hedera-node/test-clients/src/main/solidity/TokenCreateContract/TokenCreateContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenCreateContract/TokenCreateContract.sol
rename to hedera-node/test-clients/src/main/solidity/TokenCreateContract/TokenCreateContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol b/hedera-node/test-clients/src/main/solidity/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol
similarity index 75%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol
rename to hedera-node/test-clients/src/main/solidity/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol
index f0194c3cad7a..c64ef8f9e43e 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenDefaultKycAndFreezeStatus/TokenDefaultKycAndFreezeStatus.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract TokenDefaultKycAndFreezeStatus is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.sol b/hedera-node/test-clients/src/main/solidity/TokenExpiryContract/TokenExpiryContract.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.sol
rename to hedera-node/test-clients/src/main/solidity/TokenExpiryContract/TokenExpiryContract.sol
index 6fdf24b210b4..378b3d22c07d 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenExpiryContract/TokenExpiryContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenExpiryContract/TokenExpiryContract.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
 
 contract TokenExpiryContract is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.sol b/hedera-node/test-clients/src/main/solidity/TokenInfoContract/TokenInfoContract.sol
similarity index 99%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.sol
rename to hedera-node/test-clients/src/main/solidity/TokenInfoContract/TokenInfoContract.sol
index e034f6949f11..dc320c7db47b 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoContract/TokenInfoContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenInfoContract/TokenInfoContract.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./FeeHelper.sol";
+import "../FeeHelper/FeeHelper.sol";
 
 contract TokenInfoContract is FeeHelper {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol b/hedera-node/test-clients/src/main/solidity/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol
similarity index 99%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol
rename to hedera-node/test-clients/src/main/solidity/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol
index dea80aaafce6..ddd727ed84c7 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenInfoSingularUpdate/TokenInfoSingularUpdate.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "./KeyHelper.sol";
+import "../KeyHelper/KeyHelper.sol";
 
 contract TokenInfoSingularUpdate is HederaTokenService, KeyHelper {
     function updateTokenName(address tokenAddress, string memory name) external {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.sol b/hedera-node/test-clients/src/main/solidity/TokenMiscOperations/TokenMiscOperations.sol
similarity index 98%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.sol
rename to hedera-node/test-clients/src/main/solidity/TokenMiscOperations/TokenMiscOperations.sol
index 439074f6b674..ac6dff67ad0f 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenMiscOperations/TokenMiscOperations.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenMiscOperations/TokenMiscOperations.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./FeeHelper.sol";
+import "../FeeHelper/FeeHelper.sol";
 
 contract TokenMiscOperations is FeeHelper {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.sol b/hedera-node/test-clients/src/main/solidity/TokenTransferContract/TokenTransferContract.sol
similarity index 96%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.sol
rename to hedera-node/test-clients/src/main/solidity/TokenTransferContract/TokenTransferContract.sol
index d5923334f161..25ebbbc80215 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TokenTransferContract/TokenTransferContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/TokenTransferContract/TokenTransferContract.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "./HederaTokenService.sol";
-import "./ExpiryHelper.sol";
-import "./KeyHelper.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../ExpiryHelper/ExpiryHelper.sol";
+import "../KeyHelper/KeyHelper.sol";
 
 contract TokenTransferContract is HederaTokenService, ExpiryHelper, KeyHelper {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.sol b/hedera-node/test-clients/src/main/solidity/TopLevelTransferring/TopLevelTransferring.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.sol
rename to hedera-node/test-clients/src/main/solidity/TopLevelTransferring/TopLevelTransferring.sol
index 0935167d9625..5d5af1dd2b67 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TopLevelTransferring/TopLevelTransferring.sol
+++ b/hedera-node/test-clients/src/main/solidity/TopLevelTransferring/TopLevelTransferring.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./SubLevelTransferringContract.sol";
+import "../SubLevelTransferringContract/SubLevelTransferringContract.sol";
 
 contract TopLevelTransferring {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.sol b/hedera-node/test-clients/src/main/solidity/TouchAccountContract/TouchAccountContract.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TouchAccountContract/TouchAccountContract.sol
rename to hedera-node/test-clients/src/main/solidity/TouchAccountContract/TouchAccountContract.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.sol b/hedera-node/test-clients/src/main/solidity/ToyMaker/ToyMaker.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ToyMaker/ToyMaker.sol
rename to hedera-node/test-clients/src/main/solidity/ToyMaker/ToyMaker.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.sol b/hedera-node/test-clients/src/main/solidity/Traceability/Traceability.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Traceability/Traceability.sol
rename to hedera-node/test-clients/src/main/solidity/Traceability/Traceability.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.sol b/hedera-node/test-clients/src/main/solidity/TraceabilityCallcode/TraceabilityCallcode.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TraceabilityCallcode/TraceabilityCallcode.sol
rename to hedera-node/test-clients/src/main/solidity/TraceabilityCallcode/TraceabilityCallcode.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.sol b/hedera-node/test-clients/src/main/solidity/TransferAmountAndToken/TransferAmountAndToken.sol
similarity index 74%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.sol
rename to hedera-node/test-clients/src/main/solidity/TransferAmountAndToken/TransferAmountAndToken.sol
index 10da5399cf60..28dd88bb45ba 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAmountAndToken/TransferAmountAndToken.sol
+++ b/hedera-node/test-clients/src/main/solidity/TransferAmountAndToken/TransferAmountAndToken.sol
@@ -1,7 +1,7 @@
-/ SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract TransferAmountAndToken is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.sol b/hedera-node/test-clients/src/main/solidity/TransferAndBurn/TransferAndBurn.sol
similarity index 78%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.sol
rename to hedera-node/test-clients/src/main/solidity/TransferAndBurn/TransferAndBurn.sol
index 81f045dd1ad4..6ddb0e88e04a 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/TransferAndBurn/TransferAndBurn.sol
+++ b/hedera-node/test-clients/src/main/solidity/TransferAndBurn/TransferAndBurn.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract TransferAndBurn is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.sol b/hedera-node/test-clients/src/main/solidity/Transferring/Transferring.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Transferring/Transferring.sol
rename to hedera-node/test-clients/src/main/solidity/Transferring/Transferring.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.sol b/hedera-node/test-clients/src/main/solidity/UpdateTokenInfoContract/UpdateTokenInfoContract.sol
similarity index 95%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.sol
rename to hedera-node/test-clients/src/main/solidity/UpdateTokenInfoContract/UpdateTokenInfoContract.sol
index ef306c8ba128..ef62b7fa9d6c 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/UpdateTokenInfoContract/UpdateTokenInfoContract.sol
+++ b/hedera-node/test-clients/src/main/solidity/UpdateTokenInfoContract/UpdateTokenInfoContract.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.5.0 <0.9.0;
 pragma experimental ABIEncoderV2;
-import "./FeeHelper.sol";
-import "./HederaTokenService.sol";
-import "./IHederaTokenService.sol";
-import "./HederaResponseCodes.sol";
+import "../FeeHelper/FeeHelper.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
 
 contract UpdateTokenInfoContract is HederaTokenService, FeeHelper {
     string name = "tokenName";
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/User/User.sol b/hedera-node/test-clients/src/main/solidity/User/User.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/User/User.sol
rename to hedera-node/test-clients/src/main/solidity/User/User.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.sol b/hedera-node/test-clients/src/main/solidity/VariousCreate2Calls/VariousCreate2Calls.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/VariousCreate2Calls/VariousCreate2Calls.sol
rename to hedera-node/test-clients/src/main/solidity/VariousCreate2Calls/VariousCreate2Calls.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.sol b/hedera-node/test-clients/src/main/solidity/VerboseDeposit/VerboseDeposit.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/VerboseDeposit/VerboseDeposit.sol
rename to hedera-node/test-clients/src/main/solidity/VerboseDeposit/VerboseDeposit.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.sol b/hedera-node/test-clients/src/main/solidity/VersatileTransfers/VersatileTransfers.sol
similarity index 89%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.sol
rename to hedera-node/test-clients/src/main/solidity/VersatileTransfers/VersatileTransfers.sol
index 6288fb2cab96..a5ea2b7405fc 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/VersatileTransfers/VersatileTransfers.sol
+++ b/hedera-node/test-clients/src/main/solidity/VersatileTransfers/VersatileTransfers.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./HederaTokenService.sol";
-import "./HederaResponseCodes.sol";
-import "./FeeDistributor.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/hedera-token-service/HederaTokenService.sol";
+import "../../../../build/hedera-smart-contracts/contracts/system-contracts/HederaResponseCodes.sol";
+import "../FeeDistributor/FeeDistributor.sol";
 
 
 contract VersatileTransfers is HederaTokenService {
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.sol b/hedera-node/test-clients/src/main/solidity/Whitelister/Whitelister.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/Whitelister/Whitelister.sol
rename to hedera-node/test-clients/src/main/solidity/Whitelister/Whitelister.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.sol b/hedera-node/test-clients/src/main/solidity/WipeTokenAccount/WipeTokenAccount.sol
similarity index 88%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.sol
rename to hedera-node/test-clients/src/main/solidity/WipeTokenAccount/WipeTokenAccount.sol
index f74541218ff0..df35d2df7007 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WipeTokenAccount/WipeTokenAccount.sol
+++ b/hedera-node/test-clients/src/main/solidity/WipeTokenAccount/WipeTokenAccount.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.6.12;
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract WipeTokenAccount is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.sol b/hedera-node/test-clients/src/main/solidity/WorkingHours/WorkingHours.sol
similarity index 97%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.sol
rename to hedera-node/test-clients/src/main/solidity/WorkingHours/WorkingHours.sol
index 9bcec2ae1205..f52ee733b8b5 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/WorkingHours/WorkingHours.sol
+++ b/hedera-node/test-clients/src/main/solidity/WorkingHours/WorkingHours.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import './hip-206/HederaTokenService.sol';
-import './hip-206/HederaResponseCodes.sol';
+import '../hip-206/HederaTokenService.sol';
+import '../hip-206/HederaResponseCodes.sol';
 
 contract WorkingHours is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.sol b/hedera-node/test-clients/src/main/solidity/ZenosBank/ZenosBank.sol
similarity index 93%
rename from hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.sol
rename to hedera-node/test-clients/src/main/solidity/ZenosBank/ZenosBank.sol
index 0c778b1c80f0..f5fabc5e7512 100644
--- a/hedera-node/test-clients/src/main/resource/contract/contracts/ZenosBank/ZenosBank.sol
+++ b/hedera-node/test-clients/src/main/solidity/ZenosBank/ZenosBank.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity >=0.6.0 <0.9.0;
 
-import "./hip-206/HederaTokenService.sol";
-import "./hip-206/HederaResponseCodes.sol";
+import "../hip-206/HederaTokenService.sol";
+import "../hip-206/HederaResponseCodes.sol";
 
 contract ZenosBank is HederaTokenService {
 
diff --git a/hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/HederaResponseCodes.sol b/hedera-node/test-clients/src/main/solidity/hip-206/HederaResponseCodes.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/HederaResponseCodes.sol
rename to hedera-node/test-clients/src/main/solidity/hip-206/HederaResponseCodes.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/HederaTokenService.sol b/hedera-node/test-clients/src/main/solidity/hip-206/HederaTokenService.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/HederaTokenService.sol
rename to hedera-node/test-clients/src/main/solidity/hip-206/HederaTokenService.sol
diff --git a/hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/IHederaTokenService.sol b/hedera-node/test-clients/src/main/solidity/hip-206/IHederaTokenService.sol
similarity index 100%
rename from hedera-node/test-clients/src/main/resource/contract/solidity/hip-206/IHederaTokenService.sol
rename to hedera-node/test-clients/src/main/solidity/hip-206/IHederaTokenService.sol