fuel core 0.13 upgrade #657

Voxelot · 2022-10-28T08:10:53Z

WIP to upgrade to fuel-core 0.13 with the new generic tx format

sway tests were compiled using forc from this PR: FuelLabs/sway#3181

Because there were breaking changes to the fuel-vm opcodes, we have to check in the compiled sway files for now until a new version of forc can be released. However, releasing forc is blocked on the SDK supporting fuel-core 0.13, so the upgrades were done concurrently.

Voxelot · 2022-10-28T08:15:06Z

Getting some strange errors from the tests - @xgreenx could you have a look?

Fixed almost all tests: - 1 test fails `test_vector` with calling `array_in_vec` method. - Increase gas limit or used gas in some tests, because we changed the gas calculation rules. - Adapted signing for new cache rules.

xgreenx · 2022-10-28T15:47:56Z

Blocked by FuelLabs/fuel-vm#250 and FuelLabs/fuel-core#737

packages/fuels/tests/types.rs

packages/fuels-core/Cargo.toml

packages/fuels/tests/types.rs

Voxelot · 2022-11-01T10:27:14Z

.github/workflows/ci.yml

-            !packages/fuels/tests/**/Forc.toml
-            !packages/fuels/tests/**/Forc.lock
-            !packages/fuels/tests/.gitignore
+#      - name: Install Forc


commented out until forc can be released using this version of the sdk

Voxelot · 2022-11-01T10:27:51Z

.github/workflows/ci.yml

@@ -78,8 +78,8 @@ jobs:
          # install dasel
          curl -sSLf "$DASEL_VERSION" -L -o dasel && chmod +x dasel
          mv ./dasel /usr/local/bin/dasel
-          members=$(cat Cargo.toml | dasel -r toml -w json 'workspace.members' | jq -r ".[]" | xargs -L 1 basename | jq -R '[.]' | jq -s -c 'add')
-          echo "::set-output name=members::$members"
+          members=$(cat Cargo.toml | dasel -r toml -w json 'workspace.members' | jq -r ".[]" | xargs -I '{}' dasel -f {}/Cargo.toml 'package.name' | jq -R '[.]' | jq -s -c 'add')


fix cargo check to use actual package names, before each job was checking the whole project

Voxelot · 2022-11-01T10:29:11Z

.github/workflows/ci.yml

@@ -117,14 +117,16 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}


fixes strange errors that appear when master is ahead of the current branch. By default this action will merge master with the PR on checkout, which can cause confusion when you encounter error messages related to code changes not on the current branch.

Voxelot · 2022-11-01T10:29:38Z

.github/workflows/ci.yml

@@ -135,10 +137,10 @@ jobs:

      - name: Install WebAssembly Test harness
        if: ${{ matrix.command == 'test' }}
-        uses: actions-rs/cargo@v1
+        uses: baptiste0928/cargo-install@v1


takes ~1s with a warm cache instead of ~5m

Voxelot · 2022-11-01T10:29:49Z

.github/workflows/ci.yml

-        with:
-          name: sway-examples
-          path: packages/fuels/tests/
+#      - name: Download sway example artifacts


commented out until forc can be released using this version of the sdk

hal3e

You have commented a line in the .gitignore and now you are pushing the outputs of the sway projects.

hal3e · 2022-11-01T10:28:36Z

.gitignore

@@ -16,7 +16,7 @@ docs/book/
 packages/fuels/tests/**/**/Forc.lock

 # Don't add out/ files from test Sway projects.
-packages/fuels/tests/**/**/out/
+# packages/fuels/tests/**/**/out/


IMO you need to remove this.

This was intentional.

sway tests were compiled using forc from this PR: FuelLabs/sway#3181

We can't get these sway files to work with the new VM without this version of forc. However forc can't be released until the SDK is published with fuel-core v0.13 support.

See this thread for more context: https://fuellabs.slack.com/archives/C02RU9MNVKN/p1666934602020589

Voxelot · 2022-11-01T10:31:25Z

packages/fuels-signers/src/provider.rs

@@ -111,9 +116,9 @@ impl Provider {
        &self,
        tx: &Transaction,
    ) -> Result<(TransactionStatus, Vec<Receipt>), ProviderError> {
-        let tx_id = self.client.submit(tx).await?.0.to_string();
+        let tx_id = tx.id().to_string();
+        let status = self.client.submit_and_await_commit(tx).await?;


Since exeuction is no longer synchronous with tx submission, this new method will poll on the client until the tx has been processed into a block or rejected by the tx pool.

Voxelot · 2022-11-01T10:34:34Z

packages/fuels/tests/contracts/auth_testing_abi/Forc.toml

@@ -5,3 +5,5 @@ license = "Apache-2.0"
 name = "auth_testing_abi"

 [dependencies]
+core = { git = "https://github.com/FuelLabs/sway", branch = "Voxelot/fuel-core-0.13" }


this was needed to force forc to use the updated sway libs instead of the older versions on the latest release tag

Voxelot · 2022-11-01T10:38:22Z

.github/workflows/ci.yml

-            !packages/fuels/tests/**/Forc.toml
-            !packages/fuels/tests/**/Forc.lock
-            !packages/fuels/tests/.gitignore
+#      - name: Install Forc


commented out until forc can be released using this version of the sdk

Not possible

digorithm · 2022-11-01T15:27:47Z

@FuelLabs/sdk-rust

We're pushing forc outputs temporarily until the next releases of the other components due to some circular dependency issues!

Once those are out we can remove these binaries/JSONs and uncomment the CI-related stuff!

digorithm

Tracking the clean-up task here: #664.

digorithm · 2022-11-01T19:00:26Z

packages/fuels-test-helpers/src/node.rs

-impl From<MessageConfig> for Message {
-    fn from(msg: MessageConfig) -> Self {
-        Message {
-            sender: msg.sender,
-            recipient: msg.recipient,
-            nonce: msg.nonce,
-            amount: msg.amount,
-            data: msg.data,
-            da_height: DaBlockHeight(msg.da_height),
-            fuel_block_spend: None,
-        }
-    }
-}
-
-#[skip_serializing_none]
-#[serde_as]
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
-pub struct CoinConfig {
-    #[serde_as(as = "Option<HexType>")]
-    #[serde(default)]
-    pub tx_id: Option<Bytes32>,
-    #[serde_as(as = "Option<HexNumber>")]
-    #[serde(default)]
-    pub output_index: Option<u64>,
-    #[serde_as(as = "Option<HexNumber>")]
-    #[serde(default)]
-    pub block_created: Option<BlockHeight>,
-    #[serde_as(as = "Option<HexNumber>")]
-    #[serde(default)]
-    pub maturity: Option<BlockHeight>,
-    #[serde_as(as = "HexType")]
-    pub owner: Address,
-    #[serde_as(as = "HexNumber")]
-    pub amount: u64,
-    #[serde_as(as = "HexType")]
-    pub asset_id: AssetId,
-}
-


WIP to upgrade to fuel-core 0.13 with the new generic tx format sway tests were compiled using forc from this PR: FuelLabs/sway#3181 Because there were breaking changes to the fuel-vm opcodes, we have to check in the compiled sway files for now until a new version of forc can be released. However, releasing forc is blocked on the SDK supporting fuel-core 0.13, so the upgrades were done concurrently. Co-authored-by: green <xgreenx9999@gmail.com>

Voxelot added 2 commits October 28, 2022 01:01

updated to use generic transaction types, fixing tests

5f78520

use submit_and_await_status

055c803

Fixed compilations errors.

a76ce6a

Fixed almost all tests: - 1 test fails `test_vector` with calling `array_in_vec` method. - Increase gas limit or used gas in some tests, because we changed the gas calculation rules. - Adapted signing for new cache rules.

xgreenx reviewed Oct 28, 2022

View reviewed changes

packages/fuels/tests/types.rs Outdated Show resolved Hide resolved

xgreenx reviewed Oct 28, 2022

View reviewed changes

packages/fuels-core/Cargo.toml Outdated Show resolved Hide resolved

packages/fuels/tests/types.rs Outdated Show resolved Hide resolved

Voxelot added 15 commits October 28, 2022 14:54

remove usage of TxBuilder

32d81ce

try using sway dep overrides

ec5e72f

add missing override

dcd5f1c

use patch versions of fuel-core

65af1dd

remove patch and use latest release

a544467

update ci to use latest fuel core and fix package ci

69d163a

appease clippy

5da1caf

remove precompute

6aacbd2

update rust cache version

5824968

fix github warnings

45bcba7

use pr commit instead of merge commit

3eebb42

comment out unneeded ci stuff and cache wasm harness tester

e857b29

fix node config json

5257e08

Merge branch 'master' into Voxelot/fuel-core-0.13

3c6ad16

fix tokio features

f1bd08f

Voxelot mentioned this pull request Nov 1, 2022

Fix deunified build ignoring workspace package #499

Closed

Voxelot marked this pull request as ready for review November 1, 2022 10:21

Voxelot requested review from digorithm and iqdecay as code owners November 1, 2022 10:21

Voxelot commented Nov 1, 2022

View reviewed changes

hal3e previously requested changes Nov 1, 2022

View reviewed changes

Voxelot commented Nov 1, 2022

View reviewed changes

uncomment previously failing test

2e8a264

Voxelot commented Nov 1, 2022

View reviewed changes

xgreenx previously approved these changes Nov 1, 2022

View reviewed changes

digorithm mentioned this pull request Nov 1, 2022

Remove forc output files once other components are released #664

Closed

digorithm previously approved these changes Nov 1, 2022

View reviewed changes

Replaced json ChainConfig with actual from fuel-chain-config (#665)

fa1578d

xgreenx dismissed stale reviews from digorithm and themself via fa1578d November 1, 2022 17:40

digorithm approved these changes Nov 1, 2022

View reviewed changes

Voxelot merged commit f79b458 into master Nov 1, 2022

Voxelot deleted the Voxelot/fuel-core-0.13 branch November 1, 2022 22:15

digorithm mentioned this pull request Nov 2, 2022

feat: update fuel-core v0.13 FuelLabs/fuels-ts#563

Merged

iqdecay mentioned this pull request Nov 3, 2022

ci: find a way to use non-tagged version of forc in CI #670

Closed

Salka1988 mentioned this pull request Nov 16, 2022

Use non-tagged version of forc in CI #699

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fuel core 0.13 upgrade #657

fuel core 0.13 upgrade #657

Voxelot commented Oct 28, 2022 •

edited

Loading

Voxelot commented Oct 28, 2022

xgreenx commented Oct 28, 2022

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

hal3e left a comment

hal3e Nov 1, 2022

Voxelot Nov 1, 2022 •

edited

Loading

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

Voxelot Nov 1, 2022

digorithm commented Nov 1, 2022 •

edited

Loading

digorithm left a comment

digorithm Nov 1, 2022

fuel core 0.13 upgrade #657

fuel core 0.13 upgrade #657

Conversation

Voxelot commented Oct 28, 2022 • edited Loading

Voxelot commented Oct 28, 2022

xgreenx commented Oct 28, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hal3e left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Voxelot Nov 1, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

digorithm commented Nov 1, 2022 • edited Loading

digorithm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Voxelot commented Oct 28, 2022 •

edited

Loading

Voxelot Nov 1, 2022 •

edited

Loading

digorithm commented Nov 1, 2022 •

edited

Loading