Merge branch 'master' into master

.github/workflows/ci.yml

@@ -120,6 +120,7 @@ jobs:
           cargo install --debug --path ./forc-plugins/forc-fmt
           cargo install --debug --path ./forc-plugins/forc-lsp
           cargo install --debug --path ./forc-plugins/forc-client
+          cargo install --debug --path ./forc-plugins/forc-tx
           cargo install --debug forc-explore
       - name: Install mdbook-forc-documenter
         uses: actions-rs/cargo@v1
@@ -409,6 +410,7 @@ jobs:
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-plugins/forc-doc/Cargo.toml
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-plugins/forc-fmt/Cargo.toml
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-plugins/forc-lsp/Cargo.toml
+          ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-plugins/forc-tx/Cargo.toml
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-test/Cargo.toml
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-tracing/Cargo.toml
           ./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} forc-util/Cargo.toml
@@ -636,7 +638,7 @@ jobs:
           ZIP_FILE_NAME=forc-binaries-${{ env.PLATFORM_NAME }}_${{ env.ARCH }}.tar.gz
           echo "ZIP_FILE_NAME=$ZIP_FILE_NAME" >> $GITHUB_ENV
           mkdir -pv ./forc-binaries
-          for BINARY in forc forc-fmt forc-lsp forc-deploy forc-run forc-doc; do
+          for BINARY in forc forc-fmt forc-lsp forc-deploy forc-run forc-doc forc-tx; do
             cp "target/${{ matrix.job.target }}/release/$BINARY" ./forc-binaries
           done
           tar -czvf $ZIP_FILE_NAME ./forc-binaries

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "forc-plugins/forc-doc",
     "forc-plugins/forc-fmt",
     "forc-plugins/forc-lsp",
+    "forc-plugins/forc-tx",
     "forc-test",
     "forc-tracing",
     "forc-util",

examples/asm_return_tuple_pointer/src/main.sw

@@ -3,10 +3,10 @@ script;
 fn adder(a: u64, b: u64, c: u64) -> (u64, u64) {
     let empty_tuple = (0u64, 0u64);
     asm(output: empty_tuple, r1: a, r2: b, r3: c, r4, r5) {
-        add r4 r1 r2; // add a & b and put the result in r4
-        add r5 r2 r3; // add b & c and put the result in r5
-        sw output r4 i0; // store the word in r4 in output + 0 words
-        sw output r5 i1; // store the word in r5 in output + 1 word
+        add  r4 r1 r2; // add a & b and put the result in r4
+        add  r5 r2 r3; // add b & c and put the result in r5
+        sw   output r4 i0; // store the word in r4 in output + 0 words
+        sw   output r5 i1; // store the word in r5 in output + 1 word
         output: (u64, u64) // return both values
     }
 }

examples/ownership/src/main.sw

@@ -17,7 +17,7 @@ impl OwnershipExample for Contract {
     // ANCHOR: revoke_owner_example
     #[storage(write)]
     fn revoke_ownership() {
-        storage.owner = Option::None();
+        storage.owner = Option::None;
     }
     // ANCHOR_END: revoke_owner_example
     // ANCHOR: set_owner_example

forc-pkg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "forc-pkg"
-version = "0.33.0"
+version = "0.33.1"
 authors = ["Fuel Labs <[email protected]>"]
 edition = "2021"
 homepage = "https://fuel.network/"
@@ -11,20 +11,20 @@ description = "Building, locking, fetching and updating Sway projects as Forc pa
 [dependencies]
 anyhow = "1"
 fd-lock = "3.0"
-forc-tracing = { version = "0.33.0", path = "../forc-tracing" }
-forc-util = { version = "0.33.0", path = "../forc-util" }
-fuels-types = "0.33"
+forc-tracing = { version = "0.33.1", path = "../forc-tracing" }
+forc-util = { version = "0.33.1", path = "../forc-util" }
+fuel-abi-types = "0.1"
 git2 = { version = "0.14", features = ["vendored-libgit2", "vendored-openssl"] }
 hex = "0.4.3"
 petgraph = { version = "0.6", features = ["serde-1"] }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_ignored = "0.1"
 serde_json = "1.0"
-sway-core = { version = "0.33.0", path = "../sway-core" }
-sway-error = { version = "0.33.0", path = "../sway-error" }
-sway-types = { version = "0.33.0", path = "../sway-types" }
-sway-utils = { version = "0.33.0", path = "../sway-utils" }
+sway-core = { version = "0.33.1", path = "../sway-core" }
+sway-error = { version = "0.33.1", path = "../sway-error" }
+sway-types = { version = "0.33.1", path = "../sway-types" }
+sway-utils = { version = "0.33.1", path = "../sway-utils" }
 toml = "0.5"
 tracing = "0.1"
 url = { version = "2.2", features = ["serde"] }