Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cargo-psibase #534

Merged
merged 49 commits into from
Mar 4, 2024
Merged

Update cargo-psibase #534

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
b789b36
Revert "inherit version numbers"
James-Mart Dec 11, 2023
b6367e1
improve polyfill parse error message
James-Mart Dec 12, 2023
ac3879d
enable feature flags in parity-wasm for bulk memory, sign_ext, and simd
James-Mart Dec 12, 2023
05bbba4
fix admin-sys referenced wasm-psibase version
James-Mart Dec 12, 2023
c09773f
bump versions
James-Mart Dec 12, 2023
11614d4
add publish script (set to dry run the actual publish for now)
James-Mart Dec 12, 2023
6b8200f
add boot-image to crate
James-Mart Dec 13, 2023
ae41f30
enable publishing of the psibase crate
James-Mart Dec 13, 2023
599384c
rewrite cargo-psibase linker using walrus instead of parity
James-Mart Jan 19, 2024
f9c2550
add recursive instruction sequence polyfilling
James-Mart Jan 25, 2024
a7f89fc
copy all needed instructions, also pr feedback
James-Mart Jan 25, 2024
bfc220b
add missing instruction handling
James-Mart Jan 29, 2024
0afcf5e
some func renaming for clarity
James-Mart Jan 29, 2024
cdb933d
add type of new import functions to dest module
James-Mart Jan 29, 2024
fc38e44
fix merge issue
James-Mart Jan 29, 2024
fc4db16
update instructions that use locals to reference the new locals in th…
James-Mart Jan 29, 2024
85f37dd
update branch instructions and instructions that reference locals
James-Mart Jan 31, 2024
a305ba1
expose both walrus module and bytearray interfaces to linker
James-Mart Jan 31, 2024
ab5eb03
use wasm-opt crate directly rather than through binaryen
James-Mart Feb 22, 2024
1f42e1d
add tests and test data
James-Mart Feb 22, 2024
bd5405b
print wat files for easier debugging
James-Mart Feb 22, 2024
2dae5c1
fix the translation of locals
James-Mart Feb 25, 2024
ec695c0
fix types of structured control instructions
James-Mart Feb 28, 2024
2cbef63
add simpleUI for nft service
James-Mart Feb 28, 2024
8824482
add simpleUI for symbol-sys
James-Mart Feb 28, 2024
e802854
add test_contract_2
James-Mart Feb 28, 2024
de0e8de
Merge remote-tracking branch 'origin/main' into cargo-psibase-fixes
James-Mart Feb 29, 2024
ac4d8f9
update rust scripts
James-Mart Feb 29, 2024
d376c3a
use explicit version numbers in test_contract_2
James-Mart Feb 29, 2024
f7323e7
upgrade rust packages to version 0.3.0 for publishing
James-Mart Feb 29, 2024
74e989f
change name back to example, since test_contract_2 isn't a valid Acco…
James-Mart Feb 29, 2024
a68ae31
Remove restriction that disallows services without local function bodies
James-Mart Feb 29, 2024
8fa4c23
pass multiple params to set-version.sh script
James-Mart Mar 1, 2024
b81ee73
pr feedback - eliminate unneeded temp vars
James-Mart Mar 1, 2024
0a4a07b
pr feedback - avoid duplicating local polyfill functions
James-Mart Mar 1, 2024
b278bff
pr feedback - use real instruction names in error messages
James-Mart Mar 1, 2024
24da8aa
pr feedback - run cargo fmt
James-Mart Mar 1, 2024
c751e3b
return to version 0.6.0
James-Mart Mar 1, 2024
85b92e5
Merge remote-tracking branch 'origin/main' into cargo-psibase-fixes
James-Mart Mar 1, 2024
d742e1c
finish merge with main to version 0.7.0
James-Mart Mar 1, 2024
3612a38
add rust auto-formatting on save to default config
James-Mart Mar 1, 2024
0cdaf18
remove the intermediate.wasm test
James-Mart Mar 1, 2024
3204f1d
add cargo-psibase and associated tests to cmake
James-Mart Mar 3, 2024
ed03d94
improve usage of wasm-opt
James-Mart Mar 3, 2024
23d4fdb
fix cargo-psibase not rebuilding correctly
James-Mart Mar 3, 2024
af3dc16
pr feedback - allow import rewrite if polyfill is a re-export
James-Mart Mar 3, 2024
b335fb4
remove invalid profile settings
James-Mart Mar 3, 2024
97a8255
update readme
James-Mart Mar 4, 2024
8dcee24
use wasm-opt rather than binaryen on polyfill modules
James-Mart Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions rust/Cargo.lock
View file
Open in desktop
swatanabe marked this conversation as resolved.
Show resolved Hide resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ members = [
]

[workspace.package]
version = "0.5.0"
version = "0.2.0"
rust-version = "1.64"
repository = "https://github.com/gofractally/psibase"
homepage = "https://psibase.io"
4 changes: 2 additions & 2 deletions rust/account_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ publish = false
crate-type = ["cdylib", "staticlib"]

[dependencies]
fracpack = { path = "../fracpack" }
psibase = { path = "../psibase" }
fracpack = { version = "0.2.0", path = "../fracpack" }
psibase = { version = "0.2.0", path = "../psibase" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
2 changes: 1 addition & 1 deletion rust/burst-transfer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ anyhow = "1.0"
chrono = "0.4"
clap = {version = "3.1", features = ["derive"]}
futures = "0.3"
psibase = { path = "../psibase" }
psibase = { version = "0.2.0", path = "../psibase" }
rand = "0.8.5"
reqwest = { version = "0.11", default-features = false, features = ["json","rustls-tls"] }
serde = { version = "1.0", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions rust/cargo-psibase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ binaryen = "0.12"
cargo_metadata = "0.15.0"
clap = {version = "3.1", features = ["derive"]}
console = "0.15.2"
parity-wasm = "0.45"
psibase = { path = "../psibase" }
psibase = { version = "0.2.0", path = "../psibase" }
regex = "1"
serde_json = "1.0"
tokio = { version = "1", features = ["full"] }
url = "2.3"
walrus = "0.20.3"

[build-dependencies]
binaryen = "0.12"
3 changes: 2 additions & 1 deletion rust/cargo-psibase/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ fn main() {

let target_dir = out_dir.clone() + "/" + name + "-target";
if !Command::new(&cargo)
.args(["build"])
.args(["rustc"])
.args(["--color", "always"])
.args(["--target", "wasm32-wasi"])
.args(["--target-dir", &target_dir])
.args(["--manifest-path", &(package_dir + "/Cargo.toml")])
.args(["--release"])
.args(["--", "-C", "target-feature=+simd128,+bulk-memory,+sign-ext"])
.status()
.unwrap()
.success()
Expand Down
Loading