Skip to content

Commit

Permalink
Merge branch '1.1' into feat/stronghold-adapter-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Coats committed Jul 27, 2023
2 parents 66c0d7b + 6617d81 commit 56ced62
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 30 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/cancel-jobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Cancel jobs from merged/closed pull request

on:
pull_request_target:
types: [closed]
# workflow_run:
# workflows: ["*"]
# types: [requested]


jobs:
merge_job:
runs-on: ubuntu-latest
permissions:
actions: write
steps:
- uses: styfle/[email protected]
with:
ignore_sha: true
access_token: ${{ secrets.GITHUB_TOKEN }}
workflow_id: all
16 changes: 2 additions & 14 deletions .github/workflows/cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,8 @@ jobs:
tag_name: "cli-wallet-v${{ env.CRATE_VERSION }}"
release_name: "cli-wallet-v${{ env.CRATE_VERSION }}"
body: |
# Changelog
<!--- ## Added -->
<!--- ## Changed -->
<!--- ## Deprecated -->
<!--- ## Removed -->
<!--- ## Fixed -->
# Checksums
https://github.com/iotaledger/iota-sdk/blob/develop/cli/CHANGELOG.md
|Asset|SHA-256 checksum|
|---|---|
|wallet-linux||
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

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

7 changes: 7 additions & 0 deletions bindings/nodejs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security -->

## 1.0.2 - 2023-MM-DD

### Fixed

- Constructor types in `RegularTransactionEssence`;


## 1.0.1 - 2023-07-25

### Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ class RegularTransactionEssence extends TransactionEssence {
@Type(() => Input, {
discriminator: InputDiscriminator,
})
inputs: [Input];
inputs: Input[];

@Type(() => Output, {
discriminator: OutputDiscriminator,
})
outputs: [Output];
outputs: Output[];

@Type(() => Payload, {
discriminator: PayloadDiscriminator,
Expand All @@ -56,8 +56,8 @@ class RegularTransactionEssence extends TransactionEssence {
constructor(
networkId: number,
inputsCommitment: HexEncodedString,
inputs: [Input],
outputs: [Output],
inputs: Input[],
outputs: Output[],
payload: Payload | undefined,
) {
super(TransactionEssenceType.Regular);
Expand Down
24 changes: 24 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

<!-- ## Unreleased - YYYY-MM-DD
### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security -->

## 1.0.0 - 2023-07-27

First release of the `cli-wallet`.
38 changes: 29 additions & 9 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "cli-wallet"
version = "1.0.0-rc.2"
authors = [ "IOTA Stiftung" ]
version = "1.0.0"
authors = ["IOTA Stiftung"]
edition = "2021"
homepage = "https://iota.org"
description = "Command line interface wallet application based on the IOTA SDK"
Expand All @@ -12,18 +12,38 @@ name = "wallet"
path = "src/main.rs"

[dependencies]
iota-sdk = { path = "../sdk", default-features = false, features = [ "wallet", "tls", "storage", "rocksdb", "stronghold", "participation" ] }
iota-sdk = { path = "../sdk", default-features = false, features = [
"wallet",
"tls",
"storage",
"rocksdb",
"stronghold",
"participation",
] }

chrono = { version = "0.4.26", default-features = false, features = [ "std" ] }
clap = { version = "4.3.19", default-features = false, features = [ "std", "color", "help", "usage", "error-context", "suggestions", "derive", "env" ] }
chrono = { version = "0.4.26", default-features = false, features = ["std"] }
clap = { version = "4.3.19", default-features = false, features = [
"std",
"color",
"help",
"usage",
"error-context",
"suggestions",
"derive",
"env",
] }
colored = { version = "2.0.4", default-features = false }
dialoguer = { version = "0.10.4", default-features = false, features = [ "history", "password", "completion" ] }
dialoguer = { version = "0.10.4", default-features = false, features = [
"history",
"password",
"completion",
] }
dotenvy = { version = "0.15.7", default-features = false }
fern-logger = { version = "0.5.0", default-features = false }
humantime = { version = "2.1.0", default-features = false }
log = { version = "0.4.19", default-features = false }
prefix-hex = { version = "0.7.1", default-features = false, features = [ "std" ] }
serde_json = { version = "1.0.103", default-features = false }
prefix-hex = { version = "0.7.1", default-features = false, features = ["std"] }
serde_json = { version = "1.0.104", default-features = false }
thiserror = { version = "1.0.44", default-features = false }
tokio = { version = "1.29.1", default-features = false, features = [ "fs" ] }
tokio = { version = "1.29.1", default-features = false, features = ["fs"] }
zeroize = { version = "1.6.0", default-features = false }

0 comments on commit 56ced62

Please sign in to comment.