Merge branch 'develop' into balance-refactor-3

iotaledger · Oct 2, 2023 · accdb03 · accdb03
2 parents 81c63fc + 9a860db
commit accdb03
Show file tree

Hide file tree

Showing 22 changed files with 4,092 additions and 4,190 deletions.
diff --git a/.github/workflows/bindings-nodejs.yml b/.github/workflows/bindings-nodejs.yml
@@ -2,7 +2,7 @@ name: Nodejs bindings checks
 
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files
@@ -15,7 +15,7 @@ on:
       - "bindings/nodejs/**"
       - ".github/workflows/bindings-nodejs.yml"
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files

diff --git a/.github/workflows/bindings-python.yml b/.github/workflows/bindings-python.yml
@@ -2,7 +2,7 @@ name: Python bindings checks
 
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files
@@ -15,7 +15,7 @@ on:
       - "bindings/python/**"
       - ".github/workflows/bindings-python.yml"
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files

diff --git a/.github/workflows/bindings-wasm.yml b/.github/workflows/bindings-wasm.yml
@@ -1,7 +1,7 @@
 name: Wasm bindings checks
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files
@@ -15,7 +15,7 @@ on:
       - "bindings/nodejs/**"
       - ".github/workflows/bindings-wasm.yml"
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".github/actions/**"
       - "**.rs" # Include all rust files

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -2,7 +2,7 @@ name: Build and Run Tests
 
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/build-and-test.yml"
@@ -12,7 +12,7 @@ on:
       - "**Cargo.lock" # Include all Cargo.lock files
       - "!**/bindings/**" # Exclude all bindings
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/build-and-test.yml"

diff --git a/.github/workflows/common-features.yml b/.github/workflows/common-features.yml
@@ -1,7 +1,7 @@
 name: Common Feature Sets
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/common-features.yml"
@@ -11,7 +11,7 @@ on:
       - "**Cargo.lock" # Include all Cargo.lock files
       - "!**/bindings/**" # Exclude all bindings
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/common-features.yml"

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,7 +2,7 @@ name: Test coverage
 
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/coverage.yml"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 name: Linting
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/lint.yml"
@@ -11,7 +11,7 @@ on:
       - "**Cargo.lock" # Include all Cargo.lock files
       - "!**/bindings/**" # Exclude all bindings
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/lint.yml"

diff --git a/.github/workflows/private-tangle-tests.yml b/.github/workflows/private-tangle-tests.yml
@@ -2,7 +2,7 @@ name: Build and run specific tests on a private tangle
 
 on:
   push:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/private-tangle-tests.yml"
@@ -14,7 +14,7 @@ on:
       - "**Cargo.lock"
       - "!cli/**" # Exclude CLI
   pull_request:
-    branches: [develop, production, "1.1"]
+    branches: [develop, staging]
     paths:
       - ".cargo/config.toml"
       - ".github/workflows/private-tangle-tests.yml"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/nodejs/CHANGELOG.md b/bindings/nodejs/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security -->
 
-## 1.1.0-rc.3 - 2023-MM-DD
+## 1.1.0 - 2023-09-29
 
 ### Changed
 

diff --git a/bindings/nodejs/package-lock.json b/bindings/nodejs/package-lock.json
diff --git a/bindings/nodejs/package.json b/bindings/nodejs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@iota/sdk",
-    "version": "1.1.0-rc.2",
+    "version": "1.1.0",
     "description": "Node.js binding to the IOTA SDK library",
     "main": "out/index.js",
     "types": "out/index.d.ts",