Merge pull request #1239 from seanyoung/bump

Bump solana_rbpf, tower-lsp, and contract-metadata crates

Cargo.toml

@@ -29,15 +29,15 @@ tiny-keccak = { version = "2.0", features = ["keccak"] }
 serde_json = "1.0"
 serde = "1.0"
 serde_derive = { version = "1.0" }
-inkwell = { version = "0.1.0", features = ["target-webassembly", "target-bpf", "no-libffi-linking", "llvm15-0"], optional = true }
+inkwell = { version = "0.1.1", features = ["target-webassembly", "target-bpf", "no-libffi-linking", "llvm15-0"], optional = true }
 blake2-rfc = "0.2.18"
 handlebars = "4.3"
-contract-metadata = "1.5.1"
+contract-metadata = "2.1"
 semver = { version = "1.0", features = ["serde"] }
-tempfile = "3.3"
+tempfile = "3.4"
 libc = { version = "0.2", optional = true }
-tower-lsp = "0.18"
-tokio = { version = "1.25", features = ["rt", "io-std", "macros"] }
+tower-lsp = "0.19"
+tokio = { version = "1.27", features = ["rt", "io-std", "macros"] }
 base58 = "0.2.0"
 sha2 = "0.10"
 ripemd = "0.1"
@@ -54,9 +54,9 @@ rust-lapper = "1.1"
 anchor-syn = { version = "0.27.0", features = ["idl"] }
 convert_case = "0.6"
 parse-display = "0.8.0"
-parity-scale-codec = "3.3"
-ink = "4.0.0-beta.1"
-scale-info = "2.3"
+parity-scale-codec = "3.4"
+ink = "4.1.0"
+scale-info = "2.4"
 petgraph = "0.6.3"
 
 [dev-dependencies]
@@ -67,7 +67,7 @@ wasmi = "0.11"
 rand_07 = { package = "rand", version = "0.7" }
 sha2 = "0.10"
 # solana_rbpf makes api changes in patch versions
-solana_rbpf = "=0.2.35"
+solana_rbpf = "=0.2.38"
 byteorder = "1.4"
 assert_cmd = "2.0"
 bincode = "1.3"

solang-parser/Cargo.toml

@@ -24,7 +24,7 @@ thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
 
 [dev-dependencies]
-walkdir = "2.3.2"
+walkdir = "2.3.3"
 regex = "1"
 pretty_assertions = "1.3"
 

src/abi/substrate.rs

@@ -482,7 +482,13 @@ pub fn metadata(contract_no: usize, code: &[u8], ns: &ast::Namespace) -> Value {
     let compiler = SourceCompiler::new(Compiler::Solang, version);
     let code_hash: [u8; 32] = hash.as_bytes().try_into().unwrap();
     let source_wasm = SourceWasm::new(code.to_vec());
-    let source = Source::new(Some(source_wasm), CodeHash(code_hash), language, compiler);
+    let source = Source::new(
+        Some(source_wasm),
+        CodeHash(code_hash),
+        language,
+        compiler,
+        None,
+    );
 
     let mut builder = Contract::builder();
     builder.name(&ns.contracts[contract_no].name);

src/bin/languageserver/mod.rs

@@ -1054,6 +1054,7 @@ impl LanguageServer for SolangServer {
                     trigger_characters: Some(vec![".".to_string()]),
                     all_commit_characters: None,
                     work_done_progress_options: Default::default(),
+                    completion_item: None,
                 }),
                 signature_help_provider: Some(SignatureHelpOptions {
                     trigger_characters: None,
@@ -1063,7 +1064,7 @@ impl LanguageServer for SolangServer {
                 document_highlight_provider: None,
                 workspace_symbol_provider: Some(OneOf::Left(true)),
                 execute_command_provider: Some(ExecuteCommandOptions {
-                    commands: vec!["dummy.do_something".to_string()],
+                    commands: vec![],
                     work_done_progress_options: Default::default(),
                 }),
                 workspace: Some(WorkspaceServerCapabilities {