Develop (#3)

* temp revert ci

* update download

* Refactor CI workflow.

* Fix ci test

---------

Co-authored-by: freehere107 <[email protected]>

Author: perrornet

.github/workflows/ci.yaml

@@ -1,9 +1,10 @@
-name: CI
+name: Build
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: ["develop", "main"]
   push:
     tags: ["*"]
+    branches: ["develop", "main"]
 
 jobs:
   build-and-deploy:
@@ -23,6 +24,11 @@ jobs:
       - uses: olegtarasov/[email protected]
         id: tag-name
 
+      - uses: benjlevesque/[email protected]
+        id: short-sha
+        with:
+          length: 7
+
       - name: Setup Golang with cache
         uses: magnetikonline/action-golang-cache@v4
         with:
@@ -43,6 +49,24 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: quay.io/subscan-explorer/solidity-verification-tool:${{ env.GIT_TAG_NAME }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Build and publish SHA docker image
+        uses: docker/build-push-action@v3
+        if: startsWith(github.ref, 'refs/tags/') == false
+        with:
+          context: .
+          push: true
+          tags: quay.io/subscan-explorer/solidity-verification-tool:sha-${{ env.SHA }}-${{ github.run_number }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - uses: 8398a7/action-slack@v3
+        if: failure()
+        with:
+          status: ${{ job.status }}
+          fields: repo,author,eventName,workflow,ref,commit
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_INCOMING_WEBHOOK_URL }}

.gitignore

@@ -2,4 +2,4 @@
 tmp
 static/v*
 static/0.*
-static/resolc
+resolc

api.go

@@ -92,6 +92,11 @@ func verificationHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if verified.Status == mismatch {
+		respondError(w, fmt.Errorf("bytecode mismatch"))
+		return
+	}
+
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	_ = json.NewEncoder(w).Encode(VerificationResponse{VerifiedStatus: verified.Status,

compile.go

@@ -170,5 +170,8 @@ func BytecodeWithoutMetadata(code string) string {
 		return code
 	}
 	metadataSize := int((numericResult * 2) + 4)
+	if metadataSize > len(code) {
+		return code
+	}
 	return code[:len(code)-metadataSize]
 }

main.go

@@ -21,12 +21,21 @@ func init() {
 
 func main() {
 	args := os.Args
-	switch args[1] {
-	case "download":
-		download()
-	default:
+
+	var server = func() {
 		http.HandleFunc("/verify", verificationHandler)
 		util.Logger().Info("Server started on :8081")
 		log.Fatal(http.ListenAndServe(":8081", nil))
 	}
+
+	if len(args) >= 2 {
+		switch args[1] {
+		case "download":
+			download()
+		default:
+			server()
+		}
+		return
+	}
+	server()
 }

main_test.go

@@ -251,7 +251,7 @@ func Test_verificationHandler(t *testing.T) {
 	if resp.VerifiedStatus != mismatch && resp.VerifiedStatus != perfect || resp.VerifiedStatus == partial {
 		t.Errorf("verification status not match")
 	}
-	if resp.Message != "ok" {
-		t.Errorf("resp message should be ok")
+	if resp.Message != "bytecode mismatch" {
+		t.Errorf("resp message should be bytecode mismatch")
 	}
 }

revive.go

@@ -26,7 +26,6 @@ func (s *ReviveMetadata) recompileContract(_ context.Context, version string) (*
 	//  ./resolc --solc ./v0.8.17+commit.8df45f5f  --standard-json<example_input.json
 	solcPath := filepath.Join(SolcManagerInstance.cacheDir, "resolc")
 	cmd := exec.Command(solcPath, "--solc", filepath.Join(SolcManagerInstance.cacheDir, version), "--standard-json")
-	fmt.Println(cmd)
 	var stdoutBuf, stderrBuf bytes.Buffer
 	cmd.Stdout = &stdoutBuf
 	cmd.Stderr = &stderrBuf
@@ -71,16 +70,26 @@ func download() {
 	const repo = "paritytech/revive"
 	apiURL := fmt.Sprintf("https://api.github.com/repos/%s/releases/latest", repo)
 	fileName := downloadLatestResolc(apiURL)
-	err := extractAndSetExec(fileName, "static", strings.Replace(fileName, ".tar.gz", "", 1), "resolc")
+	var err error
+	if strings.HasSuffix(fileName, ".tar.gz") {
+		err = extractAndSetExec(fileName, "static", strings.Replace(fileName, ".tar.gz", "", 1), "resolc")
+	} else {
+		err = os.Chmod(fileName, 0755)
+		if err != nil {
+			panic(err)
+		}
+		err = os.Rename(fileName, filepath.Join(SolcManagerInstance.cacheDir, "resolc"))
+	}
+
 	if err != nil {
 		log.Fatal(err)
 	}
 }
 
 func downloadLatestResolc(apiURL string) string {
-	fileName := "resolc-x86_64-unknown-linux-musl.tar.gz"
+	fileName := "resolc-x86_64-unknown-linux-musl"
 	if runtime.GOOS == "darwin" {
-		fileName = "resolc-universal-apple-darwin.tar.gz"
+		fileName = "resolc-universal-apple-darwin"
 	}
 
 	util.Logger().Info(fmt.Sprintf("Start downloading latest resolc binary %s", apiURL))
@@ -102,6 +111,7 @@ func downloadLatestResolc(apiURL string) string {
 	var downloadURL string
 	for _, asset := range release.Assets {
 		if asset.Name == fileName {
+			util.Debug(asset)
 			downloadURL = asset.DownloadURL
 			break
 		}

revive_test.go

@@ -27,6 +27,15 @@ func Test_downloadLatestResolc(t *testing.T) {
 		_, _ = w.Write([]byte("mock binary content"))
 	})
 
+	mux.HandleFunc("/resolc-x86_64-unknown-linux-musl", func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("mock binary content"))
+	})
+	mux.HandleFunc("/resolc-universal-apple-darwin", func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("mock binary content"))
+	})
+
 	// Create a mock server with the ServeMux
 	mockServer := httptest.NewServer(mux)
 	// Register multiple handlers
@@ -42,20 +51,28 @@ func Test_downloadLatestResolc(t *testing.T) {
 				{
 					"name": "resolc-x86_64-unknown-linux-musl.tar.gz",
 					"browser_download_url": "%s/resolc-x86_64-unknown-linux-musl.tar.gz"
+				},
+				{
+					"name": "resolc-universal-apple-darwin",
+					"browser_download_url": "%s/resolc-universal-apple-darwin"
+				},
+				{
+					"name": "resolc-x86_64-unknown-linux-musl",
+					"browser_download_url": "%s/resolc-x86_64-unknown-linux-musl"
 				}
 			]
-		}`, mockServer.URL, mockServer.URL)))
+		}`, mockServer.URL, mockServer.URL, mockServer.URL, mockServer.URL)))
 	})
 	defer mockServer.Close()
 
 	// Call the function with the mock server URL
 	fileName := downloadLatestResolc(mockServer.URL + "/repos/paritytech/revive/releases/latest")
 
 	// Check if the file was downloaded correctly
-	if runtime.GOOS == "darwin" && fileName != "resolc-universal-apple-darwin.tar.gz" {
+	if runtime.GOOS == "darwin" && (fileName != "resolc-universal-apple-darwin.tar.gz" && fileName != "resolc-universal-apple-darwin") {
 		t.Fatalf("expected file name to be resolc-universal-apple-darwin.tar.gz, got %s", fileName)
 	}
-	if runtime.GOOS == "linux" && fileName != "resolc-x86_64-unknown-linux-musl.tar.gz" {
+	if runtime.GOOS == "linux" && (fileName != "resolc-x86_64-unknown-linux-musl.tar.gz" && fileName != "resolc-x86_64-unknown-linux-musl") {
 		t.Fatalf("expected file name to be resolc-x86_64-unknown-linux-musl.tar.gz, got %s", fileName)
 	}
 }

static/example_metadata.json

@@ -10,7 +10,7 @@
     "evmVersion": "istanbul",
     "libraries": {},
     "metadata": {
-      "bytecodeHash": "ipfs"
+      "bytecodeHash": "none"
     },
     "optimizer": {
       "enabled": true,