Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[target.aarch64-apple-darwin]
linker = "/usr/bin/cc"

[target.x86_64-apple-darwin]
linker = "/usr/bin/cc"
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
export SIMPLEX_DIR="$HOME/.simplex"
curl -L https://raw.githubusercontent.com/BlockstreamResearch/smplx/master/simplexup/install | bash
echo "$SIMPLEX_DIR/bin" >> "$GITHUB_PATH"
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.4 --platform linux --arch amd64
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.6 --platform linux --arch amd64

- name: Cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
export SIMPLEX_DIR="$HOME/.simplex"
curl -L https://raw.githubusercontent.com/BlockstreamResearch/smplx/master/simplexup/install | bash
echo "$SIMPLEX_DIR/bin" >> "$GITHUB_PATH"
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.4 --platform linux --arch amd64
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.6 --platform linux --arch amd64

- name: Cache cargo
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
export SIMPLEX_DIR="$HOME/.simplex"
curl -L https://raw.githubusercontent.com/BlockstreamResearch/smplx/master/simplexup/install | bash
echo "$SIMPLEX_DIR/bin" >> "$GITHUB_PATH"
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.4 --platform linux --arch amd64
"$SIMPLEX_DIR/bin/simplexup" --install v0.0.6 --platform linux --arch amd64

- name: Cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Simplex.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
src_dir = "crates/contracts/simf"
simf_files = ["**/*.simf"]
out_dir = "crates/contracts/src/artifacts"

[test]
verbosity = "Debug"
2 changes: 1 addition & 1 deletion crates/contracts/src/programs/option_offer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ impl OptionOffer {
) -> Self {
Self {
program: OptionOfferProgram::new(OptionOfferArguments::from(parameters))
.with_pub_key(internal_key),
.with_taproot_pubkey(internal_key),
parameters,
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/contracts/src/programs/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl Options {
pub fn from_internal_key(internal_key: XOnlyPublicKey, parameters: OptionsParameters) -> Self {
Self {
program: OptionsProgram::new(OptionsArguments::from(parameters))
.with_pub_key(internal_key),
.with_taproot_pubkey(internal_key),
parameters,
}
}
Expand Down
Loading