Merge branch 'master' into feat-diskspace-check

starcoinorg · Aug 7, 2022 · 145f4e7 · 145f4e7
2 parents 186ce06 + e526915
commit 145f4e7
Show file tree

Hide file tree

Showing 154 changed files with 2,526 additions and 1,404 deletions.
diff --git a/.github/workflows/sync_blocks.yml b/.github/workflows/sync_blocks.yml
@@ -3,7 +3,7 @@ name: Sync Blocks Cron
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 5,17 * * *'
+    - cron: "0 5,17 * * *"
 
 jobs:
   syncBlocks:
@@ -17,22 +17,67 @@ jobs:
       - name: setup environment
         run: bash ./scripts/dev_setup.sh  -b -t -y
       - name: install skbn
-        run : |
+        run: |
           wget https://github.com/nuvo/skbn/releases/download/0.4.2/skbn-0.4.2-linux.tar.gz
           tar -xzf skbn-0.4.2-linux.tar.gz
           sudo cp ./skbn-0.4.2-linux/skbn /usr/local/bin/
-      - name: run sync main
+      - name: sync blocks main
         run: python3 ./scripts/sync_block.py --net main
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: run sync proxima
+      - name: sync blocks barnard
+        run: python3 ./scripts/sync_block.py --net barnard
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: sync blocks proxima
         run: python3 ./scripts/sync_block.py --net proxima
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: run sync barnard
-        run: python3 ./scripts/sync_block.py --net barnard
+      - name: backup snapshot main
+        run: python3 ./scripts/backup_snapshot.py --net main
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: sync snapshot main
+        run: python3 ./scripts/sync_snapshot.py --net main
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: check sync main result
+        run: python3 ./scripts/check_sync_snapshot_result.py --net main
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: backup snapshot barnard
+        run: python3 ./scripts/backup_snapshot.py --net barnard
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: sync snapshot barnard
+        run: python3 ./scripts/sync_snapshot.py --net barnard
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: check sync barnard result
+        run: python3 ./scripts/check_sync_snapshot_result.py --net barnard
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: backup snapshot proxima
+        run: python3 ./scripts/backup_snapshot.py --net proxima
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: sync snapshot proxima
+        run: python3 ./scripts/sync_snapshot.py --net proxima
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: check sync proxima result
+        run: python3 ./scripts/check_sync_snapshot_result.py --net proxima
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -100,7 +100,7 @@ members = [
     "cmd/miner_client/api",
     "cmd/db-exporter",
     "cmd/genesis-nft-miner",
-    "devtools/x"
+    "devtools/x",
 ]
 
 default-members = [
@@ -201,7 +201,7 @@ default-members = [
     "cmd/genesis-nft-miner",
     "stratum",
     "cmd/miner_client/api",
-    "cmd/db-exporter"
+    "cmd/db-exporter",
 ]
 
 [profile.dev]
@@ -230,4 +230,4 @@ starcoin-genesis.debug = 1
 starcoin-vm-runtime.debug = 1
 
 [profile.release.package."*"]
-debug = false
+debug = false
diff --git a/README.md b/README.md
@@ -54,6 +54,11 @@ For prerequisites and detailed build instructions please read [Build from source
 
 Download binary release from GitHub [releases](https://github.com/starcoinorg/starcoin/releases) page.
 
+Or install by one-line script:
+
+`curl --proto '=https' -O --tlsv1.2 -sSf https://raw.githubusercontent.com/starcoinorg/starcoin/master/scripts/install_starcoin_mpm.sh | sh install_starcoin_mpm.sh v1.11.12
+`
+
 ## Run dev node:
 
 ```shell

diff --git a/abi/decoder/Cargo.toml b/abi/decoder/Cargo.toml
@@ -10,15 +10,15 @@ version = "1.11.11"
 [dependencies]
 anyhow = "1.0.41"
 bcs = "0.1"
-bcs-ext = {path = "../../commons/bcs_ext"}
+bcs-ext = { path = "../../commons/bcs_ext" }
 hex = "0.4.3"
-move-binary-format = {git = "https://github.com/starcoinorg/move", rev = "ed32208eb82e87000fe2d163d2b6df3851d2b9c1"}
+move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "ed32208eb82e87000fe2d163d2b6df3851d2b9c1" }
 ordinal = "0.3.1"
-schemars = {git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2"}
-serde = {version = "1.0.130", features = ["derive", "rc"]}
+schemars = { git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2" }
+serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_bytes = "0.11"
 serde_json = "1.0"
-starcoin-abi-resolver = {path = "../resolver"}
-starcoin-abi-types = {path = "../types"}
-starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
-starcoin-vm-types = {path = "../../vm/types"}
+starcoin-abi-resolver = { path = "../resolver" }
+starcoin-abi-types = { path = "../types" }
+starcoin-resource-viewer = { path = "../../vm/resource-viewer" }
+starcoin-vm-types = { path = "../../vm/types" }
diff --git a/abi/resolver/Cargo.toml b/abi/resolver/Cargo.toml
@@ -8,11 +8,11 @@ version = "1.11.11"
 
 [dependencies]
 anyhow = "~1"
-move-model = {git = "https://github.com/starcoinorg/move", rev = "ed32208eb82e87000fe2d163d2b6df3851d2b9c1"}
-starcoin-abi-types = {path = "../types"}
-starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
-starcoin-vm-types = {path = "../../vm/types"}
+move-model = { git = "https://github.com/starcoinorg/move", rev = "ed32208eb82e87000fe2d163d2b6df3851d2b9c1" }
+starcoin-abi-types = { path = "../types" }
+starcoin-resource-viewer = { path = "../../vm/resource-viewer" }
+starcoin-vm-types = { path = "../../vm/types" }
 [dev-dependencies]
 serde_json = "1"
-stdlib = {path = "../../vm/stdlib"}
-test-helper = {path = "../../test-helper"}
+stdlib = { path = "../../vm/stdlib" }
+test-helper = { path = "../../test-helper" }
diff --git a/abi/types/Cargo.toml b/abi/types/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-starcoin-vm-types = {path = "../../vm/types"}
-anyhow="~1"
-serde="~1"
+starcoin-vm-types = { path = "../../vm/types" }
+anyhow = "~1"
+serde = "~1"
 serde_bytes = "0.11"
 serde_json = "~1"
 hex = "0.4"
-schemars = {git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2"}
+schemars = { git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2" }
diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -15,15 +15,15 @@ parking_lot = "0.12"
 serde = "1.0.130"
 serde_json = "~1"
 rand_core = { version = "0.6.3", default-features = false }
-starcoin-account-api = {path = "./api"}
-bcs-ext ={package= "bcs-ext", path = "../commons/bcs_ext" }
-starcoin-types = { path = "../types"}
-starcoin-config = { path = "../config"}
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
-starcoin-decrypt = {path = "../commons/decrypt"}
-starcoin-storage = {path = "../storage"}
-starcoin-logger = {path = "../commons/logger"}
+starcoin-account-api = { path = "./api" }
+bcs-ext = { package = "bcs-ext", path = "../commons/bcs_ext" }
+starcoin-types = { path = "../types" }
+starcoin-config = { path = "../config" }
+starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" }
+starcoin-decrypt = { path = "../commons/decrypt" }
+starcoin-storage = { path = "../storage" }
+starcoin-logger = { path = "../commons/logger" }
 
 [dev-dependencies]
-hex= "0.4.3"
-tempfile="3"
+hex = "0.4.3"
+tempfile = "3"
diff --git a/account/api/Cargo.toml b/account/api/Cargo.toml
@@ -13,15 +13,15 @@ async-trait = "0.1"
 serde = { version = "1.0.130", default-features = false }
 serde_bytes = "0.11.5"
 serde_json = "~1"
-bcs-ext ={package= "bcs-ext", path = "../../commons/bcs_ext" }
-hex= "0.4.3"
-starcoin-types = { path = "../../types"}
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
+bcs-ext = { package = "bcs-ext", path = "../../commons/bcs_ext" }
+hex = "0.4.3"
+starcoin-types = { path = "../../types" }
+starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" }
 rand = "0.8.5"
 rand_core = { version = "0.6.3", default-features = false }
 futures = "0.3.12"
 starcoin-service-registry = { path = "../../commons/service-registry" }
-schemars = {git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2"}
+schemars = { git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2" }
 
 [dev-dependencies]
 

diff --git a/account/provider/Cargo.toml b/account/provider/Cargo.toml
@@ -12,4 +12,4 @@ starcoin-account-api = { path = "../api", features = ["mock"] }
 starcoin-types = { path = "../../types" }
 starcoin-rpc-client = { path = "../../rpc/client" }
 starcoin-config = { path = "../../config" }
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
+starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" }
diff --git a/account/service/Cargo.toml b/account/service/Cargo.toml
@@ -17,11 +17,10 @@ starcoin-config = { path = "../../config" }
 starcoin-service-registry = { path = "../../commons/service-registry" }
 starcoin-account-api = { path = "../api", features = ["mock"] }
 starcoin-account = { path = "../" }
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
+starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" }
 starcoin-chain-notify = { path = "../../chain/chain-notify" }
 tokio = "1"
 
 [dev-dependencies]
 stest = { path = "../../commons/stest" }
 tempfile = "3"
-
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -14,26 +14,26 @@ futures-timer = "3.0"
 types = { path = "../types", package = "starcoin-types" }
 starcoin-storage = { path = "../storage" }
 starcoin-service-registry = { path = "../commons/service-registry" }
-crypto = { package = "starcoin-crypto", git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
-starcoin-config = { path = "../config"}
-starcoin-accumulator = { package="starcoin-accumulator", path = "../commons/accumulator"}
+crypto = { package = "starcoin-crypto", git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc" }
+starcoin-config = { path = "../config" }
+starcoin-accumulator = { package = "starcoin-accumulator", path = "../commons/accumulator" }
 starcoin-chain = { path = "../chain" }
 starcoin-consensus = { path = "../consensus" }
-starcoin-genesis = {path = "../genesis"}
-starcoin-executor = {path = "../executor", package="starcoin-executor" }
+starcoin-genesis = { path = "../genesis" }
+starcoin-executor = { path = "../executor", package = "starcoin-executor" }
 starcoin-vm-types = { path = "../vm/types" }
-starcoin-account-api = { path = "../account/api"}
+starcoin-account-api = { path = "../account/api" }
 parking_lot = "0.12"
-forkable-jellyfish-merkle = { path = "../commons/forkable-jellyfish-merkle"}
-starcoin-state-store-api = {path = "../state/state-store-api"}
-starcoin-state-tree = {path = "../state/state-tree"}
+forkable-jellyfish-merkle = { path = "../commons/forkable-jellyfish-merkle" }
+starcoin-state-store-api = { path = "../state/state-store-api" }
+starcoin-state-tree = { path = "../state/state-tree" }
 rand = "0.8.5"
 rand_core = { version = "0.6.3", default-features = false }
-starcoin-vm-runtime = { path = "../vm/vm-runtime"}
-starcoin-network-api = {path = "../network/api", package="network-api"}
-executor-benchmark = {path = "../executor/benchmark", package="starcoin-executor-benchmark" }
+starcoin-vm-runtime = { path = "../vm/vm-runtime" }
+starcoin-network-api = { path = "../network/api", package = "network-api" }
+executor-benchmark = { path = "../executor/benchmark", package = "starcoin-executor-benchmark" }
 futures = "0.3.12"
-logger = {path = "../commons/logger",package="starcoin-logger"}
+logger = { path = "../commons/logger", package = "starcoin-logger" }
 [target."cfg(target_os=\"linux\")".dependencies]
 pprof = { version = "0.10", features = ["flamegraph", "criterion"] }
 [dev-dependencies]