Skip to content

Commit 0c06d43

Browse files
authored
Upstream changes v0.11.6-rc (#1633)
* bump `iota` dependencies: - `iota` -> `v0.11.6-rc` - `fastcrypto` -> `2f502fd8570fe4e9cff36eea5bbd6fef22002898` * update js `@iota/iota-sdk` to `^0.6.0` - also use relative `@iota/iota-interaction-ts` reference for ci test * apply partial updates from `iota-json-rpc-types` to fix event deserialization issue * remove iota-interaction-ts dependency for CI test * upate iota-interaction-ts dependency to released version for CI test * add npm and linking for interactin-ts in chrome and firefix tests * bump interaction version * bump wasm bindings version * fix lockfile * fix versions * use matrix for browser tests * Upstream changes v0.11.6-rc (#1628) Upstream merge of identity_iota_interaction/src/sdk_types files for v0.11.6-rc * Update identity_iota_core/packages/iota_identity/Move.lock Keep the previous localnet version identifiers to reduce noise in the lock file Mainly authored by: wulfraem <[email protected]> and Eike Haß <[email protected]>
1 parent fb96e11 commit 0c06d43

File tree

24 files changed

+195
-174
lines changed

24 files changed

+195
-174
lines changed

.github/actions/iota-rebase-sandbox/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ runs:
2929
# url = https://api.github.com/repos/iotaledger/iota/releases/latest
3030
# releases might be visible before all binaries are available, so refer to fixed binaries here
3131
if [ "$PLATFORM" = "linux" ]; then
32-
DOWNLOAD_URL="https://github.com/iotaledger/iota/releases/download/v0.10.3-rc/iota-v0.10.3-rc-linux-x86_64.tgz"
32+
DOWNLOAD_URL="https://github.com/iotaledger/iota/releases/download/v0.11.6-rc/iota-v0.11.6-rc-linux-x86_64.tgz"
3333
elif [ "$PLATFORM" = "macos" ]; then
34-
DOWNLOAD_URL="https://github.com/iotaledger/iota/releases/download/v0.10.3-rc/iota-v0.10.3-rc-macos-arm64.tgz"
34+
DOWNLOAD_URL="https://github.com/iotaledger/iota/releases/download/v0.11.6-rc/iota-v0.11.6-rc-macos-arm64.tgz"
3535
brew install postgresql
3636
brew reinstall libpq
3737
else

.github/workflows/build-and-test.yml

Lines changed: 8 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,14 @@ jobs:
263263
run: npm run test:readme && npm run test:node
264264
working-directory: bindings/wasm/identity_wasm
265265

266-
test-wasm-firefox:
266+
test-wasm-browser:
267267
needs: build-wasm
268268
if: ${{ needs.check-for-run-condition.outputs.should-run == 'true' }}
269269
runs-on: ubuntu-24.04
270270
strategy:
271271
fail-fast: false
272272
matrix:
273-
os: [ ubuntu-24.04 ]
274-
include:
275-
- os: ubuntu-24.04
273+
browser: [ chrome, firefox ]
276274

277275
steps:
278276
- uses: actions/checkout@v3
@@ -292,56 +290,13 @@ jobs:
292290
name: identity-wasm-bindings-build
293291
path: bindings/wasm/
294292

295-
- name: Start iota sandbox
296-
uses: './.github/actions/iota-rebase-sandbox/setup'
297-
298-
- name: publish IotaIdentity package
299-
# publish the package and set the IOTA_IDENTITY_PKG_ID env variable
300-
run: echo "IOTA_IDENTITY_PKG_ID=$(./publish_identity_package.sh)" >> "$GITHUB_ENV"
301-
working-directory: identity_iota_core/scripts/
302-
303-
- name: Build Docker image
304-
uses: docker/[email protected]
305-
with:
306-
context: bindings/wasm/
307-
file: bindings/wasm/identity_wasm/cypress/Dockerfile
308-
push: false
309-
tags: cypress-test:latest
310-
load: true
311-
build-args: |
312-
IOTA_IDENTITY_PKG_ID=${{ env.IOTA_IDENTITY_PKG_ID }}
313-
314-
- name: Run cypress
315-
run: docker run --network host cypress-test test:browser:firefox
316-
317-
test-wasm-chrome:
318-
needs: build-wasm
319-
if: ${{ needs.check-for-run-condition.outputs.should-run == 'true' }}
320-
runs-on: ubuntu-24.04
321-
strategy:
322-
fail-fast: false
323-
matrix:
324-
os: [ ubuntu-24.04 ]
325-
include:
326-
- os: ubuntu-24.04
327-
328-
steps:
329-
- uses: actions/checkout@v3
330-
331-
- name: Set up Node.js
332-
uses: actions/setup-node@v1
333-
with:
334-
node-version: 20.x
335-
336-
- name: Install JS dependencies
293+
- name: Install JS dependencies # This is problematic: @iota/iota-sdk seems to not get used from the identity_wasm package, that is why reinstall deps here
337294
run: npm ci
338-
working-directory: bindings/wasm/identity_wasm
295+
working-directory: bindings/wasm/iota_interaction_ts
339296

340-
- name: Download bindings/wasm/identity_wasm artifacts
341-
uses: actions/download-artifact@v4
342-
with:
343-
name: identity-wasm-bindings-build
344-
path: bindings/wasm/
297+
- name: Setup link
298+
run: npm link ../iota_interaction_ts
299+
working-directory: bindings/wasm/identity_wasm
345300

346301
- name: Start iota sandbox
347302
uses: './.github/actions/iota-rebase-sandbox/setup'
@@ -363,4 +318,4 @@ jobs:
363318
IOTA_IDENTITY_PKG_ID=${{ env.IOTA_IDENTITY_PKG_ID }}
364319
365320
- name: Run cypress
366-
run: docker run --network host cypress-test test:browser:chrome
321+
run: docker run --network host cypress-test test:browser:${{ matrix.browser }}

bindings/grpc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ identity_iota = { path = "../../identity_iota", features = ["resolver", "sd-jwt"
2424
identity_jose = { path = "../../identity_jose" }
2525
identity_storage = { path = "../../identity_storage", features = ["memstore"] }
2626
identity_stronghold = { path = "../../identity_stronghold", features = ["send-sync-storage"] }
27-
iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.10.3-rc" }
27+
iota-sdk = { git = "https://github.com/iotaledger/iota.git", package = "iota-sdk", tag = "v0.11.6-rc" }
2828
iota-sdk-legacy = { package = "iota-sdk", version = "1.1.2", features = ["stronghold"] }
2929
prost = "0.13"
3030
rand = "0.8.5"
@@ -42,7 +42,7 @@ url = { version = "2.5", default-features = false }
4242
openssl = { version = "0.10", features = ["vendored"] } # this is not an unused dependency but required for the docker build
4343

4444
[dev-dependencies]
45-
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", package = "fastcrypto" }
45+
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898", package = "fastcrypto" }
4646
identity_storage = { path = "../../identity_storage", features = ["memstore"] }
4747
jsonpath-rust = "0.7"
4848

bindings/wasm/identity_wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ crate-type = ["cdylib", "rlib"]
1919
anyhow = "1.0.95"
2020
async-trait = { version = "0.1", default-features = false }
2121
console_error_panic_hook = { version = "0.1" }
22-
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", package = "fastcrypto" }
22+
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2f502fd8570fe4e9cff36eea5bbd6fef22002898", package = "fastcrypto" }
2323
identity_ecdsa_verifier = { path = "../../../identity_ecdsa_verifier", default-features = false, features = ["es256", "es256k"] }
2424
identity_eddsa_verifier = { path = "../../../identity_eddsa_verifier", default-features = false, features = ["ed25519"] }
2525
# Remove iota-sdk dependency while working on issue #1445

bindings/wasm/identity_wasm/cypress/app/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/wasm/identity_wasm/cypress/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
},
1515
"dependencies": {
1616
"@iota/identity-wasm": "file:../..",
17-
"@iota/iota-sdk": "^0.5.0"
17+
"@iota/iota-sdk": "^0.6.0"
1818
}
1919
}

0 commit comments

Comments
 (0)