WIP Feat btc canister

.github/workflows/build.yml

@@ -32,22 +32,6 @@ jobs:
           # make linter
           make
 
-  build-with-latest-stable-go:
-    strategy:
-      matrix:
-        os: [ ubuntu-22.04, macos-14 ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.20'
-      - run: |
-          go env
-          make build
-
   unit-test:
     name: unit-test
     runs-on: ubuntu-22.04

.github/workflows/build_rgbx.yml

@@ -0,0 +1,23 @@
+name: ci_rgbx
+on: [push, pull_request]
+
+jobs:
+  ci_rgbx:
+    name: ci_rgbx
+    runs-on: ubuntu-22.04
+    timeout-minutes: 90
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Set up Golang
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: 'go.mod'
+        id: go
+      - name: deploy
+        run: |
+          make docker-compose dapp=rgbx
+      - name: cleanup
+        if: always()
+        run: |
+          make docker-compose-down dapp=rgbx

.gitignore

@@ -7,6 +7,9 @@ datadir*
 *.log.last
 .idea
 .vscode
+.kiro
+.opencode
+build/temp
 build/chain33*
 chain33_raft-1
 build/datadir
@@ -51,3 +54,8 @@ build/CHANGELOG.md
 plugin/dapp/dex/boss/build/
 plugin/dapp/bridgevmxgo/cmd/build/bridgevmxgo/
 plugin/dapp/bridgevmxgo/cmd/build/dapptest/
+go.work*
+*.test
+*.cursor
+*.kiro
+build/temp/*

Jenkinsfile

@@ -12,27 +12,50 @@ pipeline {
         timeout(time: 2,unit: 'HOURS')
         retry(1)
         timestamps()
+        disableConcurrentBuilds()
         gitLabConnection('gitlab33')
         gitlabBuilds(builds: ['check'])
         checkoutToSubdirectory "src/github.com/33cn/plugin"
     }
-    tools {go 'go1.19'}
+    tools {go 'go1.22'}
     stages {
         stage('deploy') {
             steps {
                 dir("${PROJ_DIR}"){
                     gitlabCommitStatus(name: 'deploy'){
-                    	sh 'go version'
-                        sh 'make build_ci'
-                        sh "cd build && mkdir ${env.BUILD_NUMBER} && cp ci/* ${env.BUILD_NUMBER} -r && ./docker-compose-pre.sh modify && cp chain33* Dockerfile* docker* *.sh ${env.BUILD_NUMBER}/ && cd ${env.BUILD_NUMBER}/ && rm -rf cross2eth mix && ./docker-compose-pre.sh run ${env.BUILD_NUMBER} all "
+                        sh '''
+                            set -e
+                            go version
+                            make build_ci
+                            cd build
+                            rm -rf "${BUILD_NUMBER}"
+                            mkdir -p "${BUILD_NUMBER}"
+                            cp -r ci/* "${BUILD_NUMBER}/"
+                            ./docker-compose-pre.sh modify
+                            cp chain33* Dockerfile* docker-compose* *.sh "${BUILD_NUMBER}/"
+                            cd "${BUILD_NUMBER}"
+                            rm -rf cross2eth mix || true
+                            ./docker-compose-pre.sh run "${BUILD_NUMBER}" all
+                        '''
                     }
                 }
             }
 
             post {
                 always {
                     dir("${PROJ_DIR}"){
-                        sh "cd build/${env.BUILD_NUMBER} && ./docker-compose-pre.sh down ${env.BUILD_NUMBER} all && cd .. && rm -rf ${env.BUILD_NUMBER} && cd .. && make clean "
+                        sh '''
+                            set +e
+                            cd build
+                            if [ -d "${BUILD_NUMBER}" ]; then
+                                cd "${BUILD_NUMBER}"
+                                ./docker-compose-pre.sh down "${BUILD_NUMBER}" all || true
+                                cd ..
+                                rm -rf "${BUILD_NUMBER}"
+                            fi
+                            cd ..
+                            make clean || true
+                        '''
                     }
                 }
             }

Makefile

@@ -31,9 +31,14 @@ build: depends
 	@cp chain33.para.toml build/ci/paracross/
 
 
-build_ci: depends ## Build the binary file for CI
-	@go build -v -o $(CLI) $(SRC_CLI)
-	@go build $(BUILD_FLAGS) -v -o $(APP)
+build_ci: depends ## Build the binary file for CI (Linux/amd64|arm64 when not on Linux, for Docker)
+	@if [ "$$(uname)" = "Linux" ]; then \
+		go build $(BUILD_FLAGS) -v -o $(CLI) $(SRC_CLI) && \
+		go build $(BUILD_FLAGS) -v -o $(APP); \
+	else \
+		CGO_ENABLED=0 GOOS=linux GOARCH=$$(go env GOARCH) go build $(BUILD_FLAGS) -v -o $(CLI) $(SRC_CLI) && \
+		CGO_ENABLED=0 GOOS=linux GOARCH=$$(go env GOARCH) go build $(BUILD_FLAGS) -v -o $(APP); \
+	fi
 	@cp chain33.toml build/
 	@cp chain33.para.toml build/ci/paracross/
 
@@ -162,6 +167,10 @@ docker-compose: ## build docker-compose for chain33 run
 	@cd build && if ! [ -d ci ]; then \
 	 make -C ../ ; \
 	 fi; \
+	 if [ "$$(uname)" != "Linux" ]; then \
+	  CGO_ENABLED=0 GOOS=linux GOARCH=$$(go env GOARCH) go build $(BUILD_FLAGS) -v -o chain33 ../ && \
+	  CGO_ENABLED=0 GOOS=linux GOARCH=$$(go env GOARCH) go build $(BUILD_FLAGS) -v -o chain33-cli $(SRC_CLI); \
+	 fi; \
 	 cp chain33* Dockerfile  docker-compose.yml *.sh ci/ && cd ci/ && ./docker-compose-pre.sh run $(proj) $(dapp) $(extra) && cd ../..
 
 docker-compose-down: ## build docker-compose for chain33 run

appveyor.yml

@@ -14,12 +14,13 @@ clone_folder: c:\gopath\src\github.com\33cn\plugin
 
 environment:
   GOPATH: c:\gopath
+  GO111MODULE: on
 
 
 # set go version
 before_test:
-  - set PATH=C:\go119\bin;%PATH%
-  - set GOROOT=C:\go119
+  - set PATH=C:\go\bin;%PATH%
+  - set GOROOT=C:\go
   - go version
   - go env
 

build/autotest/run.sh

@@ -7,11 +7,6 @@ set -o pipefail
 
 # os: ubuntu18.04 x64
 
-sedfix=""
-if [ "$(uname)" == "Darwin" ]; then
-    sedfix=".bak"
-fi
-
 ## get chain33 path
 CHAIN33_PATH=$(go list -f "{{.Dir}}" github.com/33cn/chain33)
 
@@ -20,8 +15,16 @@ function build_auto_test() {
     trap "rm -f ../autotest/main.go" INT TERM EXIT
     local AutoTestMain="${CHAIN33_PATH}/cmd/autotest/main.go"
     cp "${AutoTestMain}" ./
-    sed -i $sedfix '/^package/a import _ \"github.com\/33cn\/plugin\/plugin\"' main.go
-    go build -v -i -o autotest
+    # BSD sed (macOS) does not support GNU sed's `/^package/a text` one-liner; use awk for portability.
+    awk '/^package/ && !done {
+        print
+        print "import _ \"github.com/33cn/plugin/plugin\""
+        done = 1
+        next
+    }
+    { print }
+    ' main.go > main.go.tmp && mv main.go.tmp main.go
+    go build -v -o autotest
 }
 
 function copyAutoTestConfig() {

build/docker-compose-down.sh

@@ -39,7 +39,7 @@ function down() {
     if [ "$num" -gt 0 ]; then
         # remove exsit container
         echo "=========== # docker-compose down ============="
-        docker compose down --rmi local
+        docker compose down --remove-orphans --rmi local
     fi
 }
 

build/docker-compose-pre.sh

@@ -19,6 +19,16 @@ TESTCASEFILE="testcase.sh"
 FORKTESTFILE="fork-test.sh"
 DOCKER_COMPOSE_SH="docker-compose.sh"
 
+function copy_root_files_no_overwrite() {
+    local target_dir="$1"
+    local entry
+    for entry in ./*; do
+        if [ -f "${entry}" ]; then
+            cp -n "${entry}" "${target_dir}/"
+        fi
+    done
+}
+
 function down_dapp() {
     app=$1
 
@@ -40,15 +50,15 @@ function run_dapp() {
     echo "============ run dapp=$app start ================="
     if [ "$app" == "metrics" ]; then
         cp ./ci/paracross/* ./metrics && echo $?
-        cp -n ./* ./metrics/ && echo $?
+        copy_root_files_no_overwrite "./metrics" && echo $?
         cp -r ci/dapptest/ metrics/ && echo $?
         cd metrics && pwd
         rm docker-compose-paracross.yml
         mv docker-compose-metrics.yml docker-compose-paracross.yml
         app="paracross"
     else
         rm -rf "${app}"-ci && mkdir -p "${app}"-ci && cp -r ./"${app}"/* ./"${app}"-ci && echo $?
-        cp -n ./* ./"${app}"-ci/ && echo $?
+        copy_root_files_no_overwrite "./${app}-ci" && echo $?
         if [ "$app" == "paracross" ]; then
             cp -r dapptest/ "${app}"-ci/ && echo $?
         fi

chain33.para.toml

@@ -445,6 +445,11 @@ Enable=0
 [fork.sub.rollup]
 Enable=-1
 
+[fork.sub.lightclient]
+Enable=-1
+[fork.sub.rgbx]
+Enable=-1
+
 [fork.sub.accountmanager]
 Enable=0