Revert "add solc 0.8.26"

README.md

@@ -15,8 +15,6 @@
 - 0.4.25
 - 0.5.2
 - 0.6.10
-- 0.8.11
-- 0.8.26
 
 ## 使用
 
@@ -30,12 +28,6 @@
 
     # 0.6.10 版本
     compile group: 'org.fisco-bcos', name: 'solcJ', version: '0.6.10.0'
-
-    # 0.8.11 版本
-    compile group: 'org.fisco-bcos', name: 'solcJ', version: '0.8.11.0'
-
-    # 0.8.26 版本
-    compile group  'org.fisco-bcos', name: 'solcJ', version: '0.8.26.0'
     ```
 
 - `Maven`
@@ -60,20 +52,7 @@
         <artifactId>solcJ</artifactId>
         <version>0.6.10.0</version>
     </dependency>
-  
-    #0.8.11 版本
-    <dependency>
-        <groupId>org.fisco-bcos</groupId>
-        <artifactId>solcJ</artifactId>
-        <version>0.8.11.0</version>
-    </dependency>
-    
-    #0.8.26 版本
-    <dependency>
-        <groupId>org.fisco-bcos</groupId>
-        <artifactId>solcJ</artifactId>
-        <version>0.8.26.0</version>
-    </dependency>
+
   ```
 
 ## 接口

build.gradle

@@ -87,15 +87,15 @@ test {
 }
 
 jar {
-     dependsOn(['jarAll', 'jar0425', 'jar052', 'jar0610', 'jar0811', 'jar0826', 'jarLinux', 'jarMac', 'jarWin'])
+     dependsOn(['jarAll', 'jar0425', 'jar052', 'jar0610', 'jar0811', 'jarLinux', 'jarMac', 'jarWin'])
 }
 
 task jarAll(type: Jar) {
     manifest {
         attributes(["Implementation-Timestamp": date,
                     "Git-Branch"              : branch,
                     "Git-Commit"              : commit,
-                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11, 0.8.26",
+                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11",
                     "Crypto"                  : "ecdsa, sm",
                     "OS-Name"                 : "linux, mac, win",
                     "OS-Arch"                 : "x86, arm",
@@ -122,11 +122,9 @@ task jar0425(type: Jar) {
     exclude "native/ecdsa/linux/0.5.2", "native/ecdsa/mac/0.5.2", "native/ecdsa/win/0.5.2"
     exclude "native/ecdsa/linux/0.6.10", "native/ecdsa/mac/0.6.10", "native/ecdsa/win/0.6.10"
     exclude "native/ecdsa/linux/0.8.11", "native/ecdsa/mac/0.8.11", "native/ecdsa/win/0.8.11"
-    exclude "native/ecdsa/linux/0.8.26", "native/ecdsa/mac/0.8.26", "native/ecdsa/win/0.8.26"
     exclude "native/sm/linux/0.5.2", "native/sm/mac/0.5.2", "native/sm/win/0.5.2"
     exclude "native/sm/linux/0.6.10", "native/sm/mac/0.6.10", "native/sm/win/0.6.10"
     exclude "native/sm/linux/0.8.11", "native/sm/mac/0.8.11", "native/sm/win/0.8.11"
-    exclude "native/sm/linux/0.8.26", "native/sm/mac/0.8.26", "native/sm/win/0.8.26"
 
     archiveFileName = project.name + '-0.4.25-' + project.version + '.jar';
 }
@@ -147,11 +145,9 @@ task jar052(type: Jar) {
     exclude "native/ecdsa/linux/0.4.25", "native/ecdsa/mac/0.4.25", "native/ecdsa/win/0.4.25"
     exclude "native/ecdsa/linux/0.6.10", "native/ecdsa/mac/0.6.10", "native/ecdsa/win/0.6.10"
     exclude "native/ecdsa/linux/0.8.11", "native/ecdsa/mac/0.8.11", "native/ecdsa/win/0.8.11"
-    exclude "native/ecdsa/linux/0.8.26", "native/ecdsa/mac/0.8.26", "native/ecdsa/win/0.8.26"
     exclude "native/sm/linux/0.4.25", "native/sm/mac/0.4.25", "native/sm/win/0.4.25"
     exclude "native/sm/linux/0.6.10", "native/sm/mac/0.6.10", "native/sm/win/0.6.10"
     exclude "native/sm/linux/0.8.11", "native/sm/mac/0.8.11", "native/sm/win/0.8.11"
-    exclude "native/sm/linux/0.8.26", "native/sm/mac/0.8.26", "native/sm/win/0.8.26"
 
     archiveFileName = project.name + '-0.5.2-' + project.version + '.jar';
 }
@@ -172,11 +168,9 @@ task jar0610(type: Jar) {
     exclude "native/ecdsa/linux/0.4.25", "native/ecdsa/mac/0.4.25", "native/ecdsa/win/0.4.25"
     exclude "native/ecdsa/linux/0.5.2", "native/ecdsa/mac/0.5.2", "native/ecdsa/win/0.5.2"
     exclude "native/ecdsa/linux/0.8.11", "native/ecdsa/mac/0.8.11", "native/ecdsa/win/0.8.11"
-    exclude "native/ecdsa/linux/0.8.26", "native/ecdsa/mac/0.8.26", "native/ecdsa/win/0.8.26"
     exclude "native/sm/linux/0.4.25", "native/sm/mac/0.4.25", "native/sm/win/0.4.25"
     exclude "native/sm/linux/0.5.2", "native/sm/mac/0.5.2", "native/sm/win/0.5.2"
     exclude "native/sm/linux/0.8.11", "native/sm/mac/0.8.11", "native/sm/win/0.8.11"
-    exclude "native/sm/linux/0.8.26", "native/sm/mac/0.8.26", "native/sm/win/0.8.26"
 
     archiveFileName = project.name + '-0.6.10-' + project.version + '.jar';
 }
@@ -197,46 +191,19 @@ task jar0811(type: Jar) {
     exclude "native/ecdsa/linux/0.4.25", "native/ecdsa/mac/0.4.25", "native/ecdsa/win/0.4.25"
     exclude "native/ecdsa/linux/0.5.2", "native/ecdsa/mac/0.5.2", "native/ecdsa/win/0.5.2"
     exclude "native/ecdsa/linux/0.6.10", "native/ecdsa/mac/0.6.10", "native/ecdsa/win/0.6.10"
-    exclude "native/ecdsa/linux/0.8.26", "native/ecdsa/mac/0.8.26", "native/ecdsa/win/0.8.26"
     exclude "native/sm/linux/0.4.25", "native/sm/mac/0.4.25", "native/sm/win/0.4.25"
     exclude "native/sm/linux/0.5.2", "native/sm/mac/0.5.2", "native/sm/win/0.5.2"
     exclude "native/sm/linux/0.6.10", "native/sm/mac/0.6.10", "native/sm/win/0.6.10"
-    exclude "native/sm/linux/0.8.26", "native/sm/mac/0.8.26", "native/sm/win/0.8.26"
 
     archiveFileName = project.name + '-0.8.11-' + project.version + '.jar';
 }
 
-task jar0826(type: Jar) {
-    manifest {
-        attributes(["Implementation-Timestamp": date,
-                    "Git-Branch"              : branch,
-                    "Git-Commit"              : commit,
-                    "Solidity-Version"        : "0.8.26",
-                    "Crypto"                  : "ecdsa, sm",
-                    "OS-Name"                 : "linux, mac, win",
-                    "OS-Arch"                 : "x86, arm",
-        ])
-    }
-
-    from sourceSets.main.output
-    exclude "native/ecdsa/linux/0.4.25", "native/ecdsa/mac/0.4.25", "native/ecdsa/win/0.4.25"
-    exclude "native/ecdsa/linux/0.5.2", "native/ecdsa/mac/0.5.2", "native/ecdsa/win/0.5.2"
-    exclude "native/ecdsa/linux/0.6.10", "native/ecdsa/mac/0.6.10", "native/ecdsa/win/0.6.10"
-    exclude "native/ecdsa/linux/0.8.11", "native/ecdsa/mac/0.8.11", "native/ecdsa/win/0.8.11"
-    exclude "native/sm/linux/0.4.25", "native/sm/mac/0.4.25", "native/sm/win/0.4.25"
-    exclude "native/sm/linux/0.5.2", "native/sm/mac/0.5.2", "native/sm/win/0.5.2"
-    exclude "native/sm/linux/0.6.10", "native/sm/mac/0.6.10", "native/sm/win/0.6.10"
-    exclude "native/sm/linux/0.8.11", "native/sm/mac/0.8.11", "native/sm/win/0.8.11"
-
-    archiveFileName = project.name + '-0.8.26-' + project.version + '.jar';
-}
-
 task jarLinux(type: Jar) {
     manifest {
         attributes(["Implementation-Timestamp": date,
                     "Git-Branch"              : branch,
                     "Git-Commit"              : commit,
-                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11, 0.8.26",
+                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11",
                     "Crypto"                  : "ecdsa, sm",
                     "OS-Name"                 : "linux",
                     "OS-Arch"                 : "x86, arm",
@@ -255,7 +222,7 @@ task jarMac(type: Jar) {
         attributes(["Implementation-Timestamp": date,
                     "Git-Branch"              : branch,
                     "Git-Commit"              : commit,
-                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11, 0.8.26",
+                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11",
                     "Crypto"                  : "ecdsa, sm",
                     "OS-Name"                 : "mac",
                     "OS-Arch"                 : "x86, arm",
@@ -274,7 +241,7 @@ task jarWin(type: Jar) {
         attributes(["Implementation-Timestamp": date,
                     "Git-Branch"              : branch,
                     "Git-Commit"              : commit,
-                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11, 0.8.26",
+                    "Solidity-Version"        : "0.4.25, 0.5.2, 0.6.10, 0.8.11",
                     "Crypto"                  : "ecdsa, sm",
                     "OS-Name"                 : "win",
                     "OS-Arch"                 : "x86",
@@ -481,41 +448,6 @@ publishing {
             }
         }
 
-        solc0826(MavenPublication) {
-
-            artifactId project.name + '-0.8.26'
-            groupId project.group
-            version project.version
-
-            artifact jar0826
-            artifact sourcesJar
-            artifact javadocJar
-
-            pom {
-                name = 'fisco-bcos'
-                description = 'fisco-bcos solcJ'
-                url = 'http://www.fisco-bcos.org'
-
-                licenses {
-                    license {
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id = 'zhangsan'
-                        name = 'zhangsan'
-                        email = '[email protected]'
-                    }
-                }
-                scm {
-                    connection = 'https://github.com/FISCO-BCOS/solcJ.git'
-                    url = 'https://github.com/FISCO-BCOS/solcJ.git'
-                }
-            }
-        }
-
         solcLinux(MavenPublication) {
 
             artifactId project.name + '-linux'

src/main/java/org/fisco/solc/compiler/SolidityCompiler.java

@@ -475,7 +475,6 @@ public static String runGetVersionOutput(boolean sm, Version version) throws IOE
         try {
             process.waitFor();
         } catch (InterruptedException e) {
-            e.printStackTrace();
             Thread.currentThread().interrupt();
             throw new RuntimeException(e);
         }

src/main/java/org/fisco/solc/compiler/Version.java

@@ -4,8 +4,7 @@ public enum Version {
     V0_4_25("0.4.25"),
     V0_5_2("0.5.2"),
     V0_6_10("0.6.10"),
-    V0_8_11("0.8.11"),
-    V0_8_26("0.8.26");
+    V0_8_11("0.8.11");
 
     private String version;
 

src/test/java/org/fisco/solc/compiler/test/SolcTest.java

@@ -28,16 +28,10 @@ public void smSolcTest() {
         Assert.assertNotNull(solc);
         Assert.assertTrue(solc.getExecutable().exists());
         Assert.assertTrue(solc.getExecutable().canExecute());
-
-        solc = new Solc(true, Version.V0_8_26);
-        Assert.assertNotNull(solc);
-        Assert.assertTrue(solc.getExecutable().exists());
-        Assert.assertTrue(solc.getExecutable().canExecute());
     }
 
     @Test
     public void ecdsaSolcTest() {
-
         Solc solc = new Solc(false, Version.V0_4_25);
         Assert.assertNotNull(solc);
         Assert.assertTrue(solc.getExecutable().exists());
@@ -57,10 +51,5 @@ public void ecdsaSolcTest() {
         Assert.assertNotNull(solc);
         Assert.assertTrue(solc.getExecutable().exists());
         Assert.assertTrue(solc.getExecutable().canExecute());
-
-        solc = new Solc(false, Version.V0_8_26);
-        Assert.assertNotNull(solc);
-        Assert.assertTrue(solc.getExecutable().exists());
-        Assert.assertTrue(solc.getExecutable().canExecute());
     }
 }

src/test/java/org/fisco/solc/compiler/test/SolidityCompilerV0610_0811Test.java

@@ -37,15 +37,6 @@ public void compilerV0811Test() {
         docTest(Version.V0_6_10);
     }
 
-    @Test
-    public void compilerV0826Test() {
-        compileCharitySplitterFactory(false, Version.V0_8_26, true);
-        compileCharitySplitterFactory(false, Version.V0_8_26, false);
-        compileCharitySplitterFactory(true, Version.V0_8_26, true);
-        compileCharitySplitterFactory(true, Version.V0_8_26, false);
-        docTest(Version.V0_6_10);
-    }
-
     private void compileCharitySplitterFactory(boolean sm, Version version, boolean isFile) {
         try {
             URL url =

src/test/java/org/fisco/solc/compiler/test/SolidityCompilerVersionTest.java

@@ -9,10 +9,6 @@ public class SolidityCompilerVersionTest {
     @SuppressWarnings("static-access")
     @Test
     public void smSolcVersionTest() throws Exception {
-        String versionOutput0 = SolidityCompiler.runGetVersionOutput(true, Version.V0_8_26);
-        Assert.assertTrue(versionOutput0.contains("0.8.26"));
-        Assert.assertTrue(versionOutput0.toLowerCase().contains("gm"));
-
         String versionOutput = SolidityCompiler.runGetVersionOutput(true, Version.V0_8_11);
         Assert.assertTrue(versionOutput.contains("0.8.11"));
         Assert.assertTrue(versionOutput.toLowerCase().contains("gm"));
@@ -32,10 +28,6 @@ public void smSolcVersionTest() throws Exception {
 
     @Test
     public void ecdsaSolcVersionTest() throws Exception {
-        String versionOutput0 = SolidityCompiler.runGetVersionOutput(false, Version.V0_8_26);
-        Assert.assertTrue(versionOutput0.contains("0.8.26"));
-        Assert.assertFalse(versionOutput0.toLowerCase().contains("gm"));
-
         String versionOutput = SolidityCompiler.runGetVersionOutput(false, Version.V0_8_11);
         Assert.assertTrue(versionOutput.contains("0.8.11"));
         Assert.assertFalse(versionOutput.toLowerCase().contains("gm"));

src/test/resources/solidity/CharitySplitterFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity >=0.6.0 <=0.8.26;
+pragma solidity >=0.6.0 <0.8.20;
 
 contract CharitySplitter {
     address public owner;