devnet cicd (#114)

* cicd test

* typo

* test2

* fix

* fix2

* fix3

* trig

* change workflow name

* chekout step

* fix

* adjust params

* re org files

* bug

* clean output

* Feature testdevelop4 (#113)

* final update

* name

* name

* add enable-0x-prefix flag (#102)

* enable 0x test flag

* rm test file

* change script repo

* API GetTransactionProof, GetReceiptProof (#94)

* API GetReceiptProof

* API GetReceiptProof test

* add ext interface

* Trieproof fix (#96)

Trieproof fix

* add GetTransactionProof to api

* merge two API into GetTransactionAndReceiptProof

---------

Co-authored-by: wanwiset25 <[email protected]>
Co-authored-by: Galaxy <[email protected]>

* first copy  v1.10

* fix all errs outside rpc by adding functions

* fix rpc errors

* upgrade xdc to use gorilla for websocket instead of the native net

* upgrade go to 1.14

* fix issue with the duplicated name of max_socket_path_size from c

* change to self common

* add back the missing committed input parameter

* EpochNumber ummarshal

---------

Co-authored-by: Daniel Liu <[email protected]>
Co-authored-by: wgr523 <[email protected]>
Co-authored-by: Galaxy <[email protected]>
Co-authored-by: Jianrong <[email protected]>

Author: 5 people

.github/workflows/ci.yml

@@ -1,16 +1,14 @@
-name: Build and update image
-
+name: Build and publish image 
 on:
   push:
     branches:
       - master
     tags:
       - "*"
-
   workflow_dispatch: #allow manual trigger to workflow
 
 jobs:
-  test_on_pr:
+  test_build_and_push_to_docker_registry:
     name: Test, build and push image to registry
     runs-on: ubuntu-latest
     env:
@@ -24,6 +22,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: ${{ env.GOPATH }}/src/XDC-Subnet
+
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -42,6 +41,7 @@ jobs:
           make test
         env:
           GO111MODULE: auto
+
       - name: Docker login
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
@@ -53,12 +53,13 @@ jobs:
         id: image
         run: |
           if [[ "${{github.ref_name}}" == "master" ]]; then
-            echo "name= xinfinorg/xdcsubnets:latest" >> $GITHUB_OUTPUT
+            echo "name=xinfinorg/xdcsubnets:latest" >> $GITHUB_OUTPUT
           else
-            echo "name= xinfinorg/xdcsubnets:${{github.ref_name}}" >> $GITHUB_OUTPUT
+            echo "name=xinfinorg/xdcsubnets:${{github.ref_name}}" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push image
         run: |
           docker build . --file docker/Dockerfile --tag ${{ steps.image.outputs.name }}
           docker push ${{ steps.image.outputs.name }}
+

.github/workflows/pr_deploy.yaml

@@ -0,0 +1,79 @@
+name: Build and deploy devnet
+on:
+  pull_request_target:
+    branches:
+      - master
+
+jobs:
+  build_and_deploy:
+    if: startsWith(github.head_ref, 'feature') ||  startsWith(github.head_ref, 'fix')
+    name: Deploy on PR 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: check out trigger branch
+        run: |
+          git fetch origin ${{ github.head_ref }}
+          git checkout ${{ github.head_ref }}
+
+      # - name: check envs
+      #   run: | 
+      #     echo ${{ github.head_ref }}
+      #     echo ${{ github.repository }}
+      #     echo ${{ github.ref_name }}
+      #     echo ${{ github.sha }}
+
+      - name: Record branch env
+        id: branch
+        run: |
+          echo "repo=${{ github.repository }}" >> $GITHUB_OUTPUT
+          echo "branch=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          # echo $repo
+          # echo $branch
+          # echo $commit
+
+      - name: Docker login
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_ACCESS_TOKEN}}
+        run: |
+          echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+      - name: Determine Docker Image Name
+        id: image
+        run: |
+            echo "name=xinfinorg/xdcsubnets:${{ steps.branch.outputs.branch }}" >> $GITHUB_OUTPUT
+        
+
+      - name: Build and push image
+        run: |
+          docker build . --file docker/Dockerfile --tag ${{ steps.image.outputs.name }}
+          docker push ${{ steps.image.outputs.name }}
+
+      - name: trigger deploy workflow
+        id: trigger_deploy
+        run: |
+          echo "RESPONSE_CODE=$( \
+          curl -L \
+          -o response.txt \
+          -w %{response_code} \
+          -s \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.CICD_PAT }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/hash-laboratories-au/subnet-deployment/actions/workflows/subnet-deploy.yaml/dispatches \
+          -d '{"ref":"master", "inputs":{"caller_repo": "${{ steps.branch.outputs.repo }}", "caller_ref": "${{ steps.branch.outputs.branch }}", "caller_sha": "${{ steps.branch.outputs.commit }}"}}' \
+          )" >> $GITHUB_ENV
+
+      - name: Check response fail or success
+        run: |
+          cat response.txt
+          echo "RESPONSE_CODE=${{ env.RESPONSE_CODE }}"
+          if [ ${{ env.RESPONSE_CODE }} != 204 ]
+          then
+            exit 1
+          fi

.github/workflows/pr.yml .github/workflows/pr_test.yml.github/workflows/pr.yml renamed to .github/workflows/pr_test.yml

@@ -1,13 +1,12 @@
 name: PR tests
-
 on:
   pull_request:
     branches:
       - master
 
 jobs:
   test_on_pr:
-    name: Test
+    name: Test on PR
     runs-on: ubuntu-latest
     env:
       GOPATH: ${{ github.workspace }}

cmd/XDC/config.go

@@ -165,6 +165,10 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) {
 		common.TIPXDCXCancellationFee = common.TIPXDCXCancellationFeeTestnet
 	}
 
+	if ctx.GlobalBool(utils.Enable0xPrefixFlag.Name) {
+		common.Enable0xPrefix = true
+	}
+
 	// Rewound
 	if rewound := ctx.GlobalInt(utils.RewoundFlag.Name); rewound != 0 {
 		common.Rewound = uint64(rewound)

cmd/XDC/main.go

@@ -112,6 +112,7 @@ var (
 		//utils.TestnetFlag,
 		//utils.VMEnableDebugFlag,
 		utils.XDCTestnetFlag,
+		utils.Enable0xPrefixFlag,
 		utils.RewoundFlag,
 		utils.NetworkIdFlag,
 		utils.RPCCORSDomainFlag,

cmd/utils/flags.go

@@ -116,6 +116,10 @@ var (
 		Usage: "Rollback chain at hash",
 		Value: "",
 	}
+	Enable0xPrefixFlag = cli.BoolFlag{
+		Name:  "enable-0x-prefix",
+		Usage: "Addres use 0x-prefix (default = false)",
+	}
 	// General settings
 	AnnounceTxsFlag = cli.BoolFlag{
 		Name:  "announce-txs",

common/constants.go

@@ -43,6 +43,7 @@ var TIPXDCXCancellationFeeTestnet = big.NewInt(0)
 
 var TIPXDCXTestnet = big.NewInt(0)
 var IsTestnet bool = false
+var Enable0xPrefix bool = false
 var StoreRewardFolder string
 var RollbackHash Hash
 var BasePrice = big.NewInt(1000000000000000000)                       // 1

common/types.go

@@ -250,8 +250,11 @@ func (a *Address) Set(other Address) {
 // MarshalText returns the hex representation of a.
 func (a Address) MarshalText() ([]byte, error) {
 	// Handle '0x' or 'xdc' prefix here.
-	// return hexutil.Bytes(a[:]).MarshalText()
-	return hexutil.Bytes(a[:]).MarshalXDCText()
+	if Enable0xPrefix {
+		return hexutil.Bytes(a[:]).MarshalText()
+	} else {
+		return hexutil.Bytes(a[:]).MarshalXDCText()
+	}
 }
 
 // UnmarshalText parses a hash in hex syntax.

docker/start.sh

@@ -146,4 +146,5 @@ XDC $params \
 --targetgaslimit "420000000" \
 --ws --wsaddr=0.0.0.0 \
 --mine \
+--enable-0x-prefix \
 --wsorigins "*" 2>&1 >>$DATA_DIR/xdc.log | tee --append $DATA_DIR/xdc.log