release 6.2 (#636)

Co-authored-by: Vasily Selivanov <[email protected]>
gosh-sh · Dec 11, 2023 · 5dffae4 · 5dffae4
1 parent f4bab44
commit 5dffae4
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 20 deletions.
diff --git a/.github/workflows/prerelease.yaml b/.github/workflows/prerelease.yaml
@@ -45,6 +45,7 @@ jobs:
           - git-remote-gosh_v5_1_0
           - git-remote-gosh_v6_0_0
           - git-remote-gosh_v6_1_0
+          - git-remote-gosh_v6_2_0
         result:
           - git-remote-gosh-darwin-arm64
           - git-remote-gosh-darwin-amd64
@@ -88,6 +89,8 @@ jobs:
             dir: v6_x/v6.0.0/git-remote-gosh
           - bin: git-remote-gosh_v6_1_0
             dir: v6_x/v6.1.0/git-remote-gosh
+          - bin: git-remote-gosh_v6_2_0
+            dir: v6_x/v6.2.0/git-remote-gosh
 
     name: B ${{ matrix.bin }} ${{ matrix.target }}
 

diff --git a/gosh-dispatcher/Cargo.toml b/gosh-dispatcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git-remote-gosh"
-version = "6.1.35"
+version = "6.2.36"
 edition = "2021"
 keywords = ['git-remote', 'git', 'gosh']
 rust-version = "1.70"

diff --git a/tests/deploy_gosh.sh b/tests/deploy_gosh.sh
@@ -9,6 +9,7 @@ case $1 in
   4) VERSION="v4_x";;
   5) VERSION="v5_x/v5.1.0";;
   6) VERSION="v6_x/v6.1.0";;
+  7) VERSION="v6_x/v6.2.0";;
   *) VERSION="v${1}_x/v${1}.0.0";;
 esac
 

diff --git a/tests/node_se_scripts/deploy.sh b/tests/node_se_scripts/deploy.sh
@@ -65,6 +65,8 @@ elif [ "$VERSION" = "v6_x/v6.0.0" ]; then
   echo "" > SystemContract-6.0.0.addr
 elif [ "$VERSION" = "v6_x/v6.1.0" ]; then
   echo "" > SystemContract-6.1.0.addr
+elif [ "$VERSION" = "v6_x/v6.2.0" ]; then
+  echo "" > SystemContract-6.2.0.addr
 else
  exit 1
 fi

diff --git a/tests/upgrade_deploy_gosh.sh b/tests/upgrade_deploy_gosh.sh
@@ -9,6 +9,7 @@ case $1 in
   4) INPUT_VERSION="v4_x";;
   5) INPUT_VERSION="v5_x/v5.1.0";;
   6) INPUT_VERSION="v6_x/v6.0.0";;
+  7) INPUT_VERSION="v6_x/v6.1.0";;
   *) INPUT_VERSION="v${1}_x/v${1}.0.0";;
 esac
 
@@ -19,6 +20,7 @@ case $2 in
   4) INPUT_VERSION2="v4_x";;
   5) INPUT_VERSION2="v5_x/v5.1.0";;
   6) INPUT_VERSION2="v6_x/v6.1.0";;
+  7) INPUT_VERSION2="v6_x/v6.2.0";;
   *) INPUT_VERSION2="v${2}_x/v${2}.0.0";;
 esac
 

diff --git a/v5_x/v5.0.0/git-remote-gosh/src/blockchain/mod.rs b/v5_x/v5.0.0/git-remote-gosh/src/blockchain/mod.rs
@@ -63,7 +63,7 @@ pub const EMPTY_BLOB_SHA1: &str = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391";
 pub const EMPTY_BLOB_SHA256: &str =
     "0x96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7";
 
-pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 255;
+pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 50;
 
 static PINNED_CONTRACT_BOCREFS: Lazy<
     Arc<RwLock<HashMap<BlockchainContractAddress, (String, EverClient)>>>,

diff --git a/v5_x/v5.1.0/git-remote-gosh/src/blockchain/mod.rs b/v5_x/v5.1.0/git-remote-gosh/src/blockchain/mod.rs
@@ -63,7 +63,7 @@ pub const EMPTY_BLOB_SHA1: &str = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391";
 pub const EMPTY_BLOB_SHA256: &str =
     "0x96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7";
 
-pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 255;
+pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 50;
 
 static PINNED_CONTRACT_BOCREFS: Lazy<
     Arc<RwLock<HashMap<BlockchainContractAddress, (String, EverClient)>>>,

diff --git a/v6_x/v6.0.0/git-remote-gosh/src/blockchain/mod.rs b/v6_x/v6.0.0/git-remote-gosh/src/blockchain/mod.rs
@@ -63,7 +63,7 @@ pub const EMPTY_BLOB_SHA1: &str = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391";
 pub const EMPTY_BLOB_SHA256: &str =
     "0x96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7";
 
-pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 255;
+pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 50;
 
 static PINNED_CONTRACT_BOCREFS: Lazy<
     Arc<RwLock<HashMap<BlockchainContractAddress, (String, EverClient)>>>,

diff --git a/v6_x/v6.2.0/git-remote-gosh/Cargo.toml b/v6_x/v6.2.0/git-remote-gosh/Cargo.toml
@@ -1,5 +1,5 @@
 [[bin]]
-name = 'git-remote-gosh_v6_1_0'
+name = 'git-remote-gosh_v6_2_0'
 path = 'src/bin/main.rs'
 
 [lib]
@@ -13,8 +13,8 @@ edition = '2021'
 keywords = ['git-remote', 'git', 'gosh']
 name = 'git-remote-gosh'
 resolver = '2'
-rust-version = "1.68"
-version = '6.1.32'
+rust-version = "1.70"
+version = '6.2.36'
 
 [profile.profiling]
 debug = 1
@@ -58,11 +58,10 @@ git-traverse = '0.22.2'
 hex = '0.4.3'
 indexmap = '1.9.2'
 lru = '0.8.1'
-memcache = '0.17.0'
+memcache = { version = '0.17.0', default-features = false }  #! disable tls/openssl
 mockall_double = '0.3.0'
 object-pool = "0.5.4"
 once_cell = "1.16.0"
-openssl = {version = '0.10', features = ['vendored']}
 opentelemetry = {version = "0.18.0", features = ["rt-tokio"]}
 opentelemetry-otlp = {version = "0.11.0", features = ["grpc-tonic"]}
 opentelemetry-semantic-conventions = "0.10.0"
@@ -97,27 +96,26 @@ default-features = true
 version = '0.2.5'
 
 [dependencies.reqwest]
-features = ['blocking', 'gzip', 'json', 'multipart', 'stream']
+default-features = false
+features = ['blocking', 'gzip', 'json', 'multipart', 'stream', 'rustls-tls']
 version = '0.11.14'
 
 [dependencies.tokio]
 features = ['full', 'rt']
 version = '1.21.2'
 
 [dependencies.ton_client]
-git = 'https://github.com/tonlabs/ever-sdk.git'
+git = 'https://github.com/gosh-sh/ever-sdk.git'
+default-features = false
+features = ['std', 'rustls-tls-webpki-roots']
 package = 'ton_client'
-tag = "1.43.1"
+tag = "1.43.1-rustls"
 
 [dependencies.ton_sdk]
-git = 'https://github.com/tonlabs/ever-sdk.git'
+git = 'https://github.com/gosh-sh/ever-sdk.git'
 package = 'ton_sdk'
-tag = "1.43.1"
+tag = "1.43.1-rustls"
 
 [dependencies.zstd]
 default-features = false
 version = '0.11.2+zstd.1.5.2'
-
-[patch.crates-io.tokio]
-git = 'https://github.com/tokio-rs/tokio'
-tag = 'tokio-1.21.2'
diff --git a/v6_x/v6.2.0/git-remote-gosh/build.rs b/v6_x/v6.2.0/git-remote-gosh/build.rs
@@ -1,6 +1,7 @@
-use std::fs::File;
+use std::fs::{copy, create_dir_all, read_dir, File};
 use std::io;
 use std::io::BufRead;
+use std::path::Path;
 
 fn get_version_from_solidity_source() -> String {
     let contracts_path = std::env::var("CONTRACTS_DIR").expect(
@@ -23,6 +24,18 @@ fn get_version_from_solidity_source() -> String {
 }
 
 fn main() {
+    let resources = Path::new("./resources");
+    create_dir_all(resources).expect("create resources directory");
+
+    let abi_dir = option_env!("ABI_DIR").unwrap_or("../contracts/gosh");
+    for entry in read_dir(abi_dir).expect("read contracts directory") {
+        if let Ok(e) = entry {
+            if e.file_name().to_str().unwrap().ends_with("abi.json") {
+                copy(e.path(), resources.join(e.file_name())).expect("error while copy abi");
+            }
+        }
+    }
+
     println!("cargo:rerun-if-env-changed=CONTRACTS_DIR");
     println!("cargo:rerun-if-changed=.cargo/config.toml");
     println!("cargo:rerun-if-env-changed=GOSH_SUPPORTED_CONTRACT_VERSION");

diff --git a/v6_x/v6.2.0/git-remote-gosh/src/blockchain/mod.rs b/v6_x/v6.2.0/git-remote-gosh/src/blockchain/mod.rs
@@ -63,7 +63,7 @@ pub const EMPTY_BLOB_SHA1: &str = "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391";
 pub const EMPTY_BLOB_SHA256: &str =
     "0x96a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7";
 
-pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 255;
+pub const MAX_ACCOUNTS_ADDRESSES_PER_QUERY: usize = 50;
 
 static PINNED_CONTRACT_BOCREFS: Lazy<
     Arc<RwLock<HashMap<BlockchainContractAddress, (String, EverClient)>>>,