Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

chore: upgrade to beta-4 dependencies #1192

Merged
merged 17 commits into from
Aug 11, 2023
Merged

chore: upgrade to beta-4 dependencies #1192

merged 17 commits into from
Aug 11, 2023

Conversation

deekerno
Copy link
Contributor

@deekerno deekerno commented Aug 3, 2023 •
edited
Loading

Closes #1167.

Description

Upgrades the indexer to beta-4-compatible dependencies.

Testing steps

CI should pass.

As a manual test, run the explorer example and make sure that queries work properly.

@deekerno deekerno self-assigned this Aug 3, 2023
@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch 4 times, most recently from 09fa7cc to f6d39ee Compare August 8, 2023 21:04
@ra0x3 ra0x3 removed chore labels Aug 8, 2023
@ra0x3 ra0x3 linked an issue Aug 8, 2023 that may be closed by this pull request
Upgrade to rustc 1.71 #1074
Closed
@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch 2 times, most recently from dd10c1d to 1fd5de9 Compare August 9, 2023 14:57
@deekerno deekerno changed the base branch from develop to beta-4-release August 9, 2023 14:57
@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch 2 times, most recently from dd10c1d to 3b30f68 Compare August 9, 2023 15:04
@deekerno deekerno added P: High blocked This change is currently blocked by a linked issue and removed P: Medium labels Aug 9, 2023
@deekerno
Copy link
Contributor Author

deekerno commented Aug 9, 2023

This PR is currently blocked until fuels-rs is released with support for fuel-core v0.20.1; the SDK team has stated that it will happen very soon.

@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch from d1477a8 to e03abb1 Compare August 10, 2023 00:34
@deekerno deekerno removed the blocked This change is currently blocked by a linked issue label Aug 10, 2023
@deekerno deekerno marked this pull request as ready for review August 10, 2023 01:27
@deekerno deekerno requested review from ra0x3 and lostman as code owners August 10, 2023 01:27
ra0x3
ra0x3 reviewed Aug 10, 2023
View reviewed changes
Copy link
Contributor

@ra0x3 ra0x3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deekerno

  • Looks mostly ok thanks for getting to this
  • Left some questions
  • Also don't forget to update the rustc version in ci.yml

.github/CODEOWNERS Outdated Show resolved Hide resolved
Cargo.toml Show resolved Hide resolved
packages/fuel-indexer-tests/src/fixtures.rs Show resolved Hide resolved
plugins/forc-index/src/defaults.rs Outdated Show resolved Hide resolved
@deekerno
Copy link
Contributor Author

@deekerno

  • Looks mostly ok thanks for getting to this

  • Left some questions

  • Also don't forget to update the rustc version in ci.yml

@ra0x3 Looks like a rebase I did when moving computers blew away some of the changes I had 😅 will fix and re-request.

@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch from 03ca935 to 679a488 Compare August 10, 2023 14:48
@deekerno deekerno force-pushed the deekerno/beta-4-dependency-upgrade branch from 688c9c5 to e303839 Compare August 10, 2023 16:30
@deekerno deekerno changed the base branch from beta-4-release to develop August 10, 2023 16:30
@deekerno deekerno changed the base branch from develop to feature/beta-4-release August 11, 2023 14:04
ra0x3
ra0x3 approved these changes Aug 11, 2023
View reviewed changes
Copy link
Contributor

@ra0x3 ra0x3 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Code looks fine, thanks @deekerno
  • Merging this into the feature branch so as to not block anything
  • We will wait until beta-4.fuel.network is up to test this stuff
  • After we manually test that, we can merge feature/beta-4-release into develop

@ra0x3 ra0x3 merged commit eb7d890 into feature/beta-4-release Aug 11, 2023
@ra0x3 ra0x3 deleted the deekerno/beta-4-dependency-upgrade branch August 11, 2023 14:23
ra0x3 pushed a commit that referenced this pull request Aug 15, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
8f5e9f8 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 15, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
7f1fcb0 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
deekerno added a commit that referenced this pull request Aug 15, 2023
@ra0x3 @deekerno
feature: prepare for beta-4 release (#1258)
56e6206 
* chore: upgrade to beta-4 dependencies (#1192)

* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>

* enhancement: add support for `Mint` and `Burn` receipts (#1259)

* ci: optimize and condense E2E tests (#1263)

* First pass; combine non-output receipt tests into one

* Combine explorer-related tests

* Combine tests that hit /ping

* Combine receipt tests again

* Finish optimization of e2e::indexing_postgres

* Remove unused replace-indexer tests from indexing_postgres

* Remove outdated, unused test from integration::service

* Condense GraphQL API E2E tests

* Use get_or_create() in test indexer

* Remove IDs checks in E2E tests

* Cleanup formatting and folder structure

* Move http_client into WebTestComponents

* Upgrade Sway version

* cargo fmt

* Adjust EXPECTED_CONTRACT_ID

* Upgrade fuels-rs to v0.45.1

* fix bad cherry-pick

* update docs to beta-4

* updates

* Bump SDK to v0.46

---------

Co-authored-by: Alexander <alex@deekerno.com>
Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 15, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
411df43 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 15, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
502b4b5 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 16, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
b934c88 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 16, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
1349750 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 16, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
2df5916 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 pushed a commit that referenced this pull request Aug 16, 2023
@deekerno
chore: upgrade to beta-4 dependencies (#1192)
23857c4 
* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
ra0x3 added a commit that referenced this pull request Aug 17, 2023
@ra0x3 @deekerno
refactor: swap ID from u64 to SizedAsciiString<64> (#1217)
45e602b 
* chore: upgrade to beta-4 dependencies (#1192)

* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>

* enhancement: add support for `Mint` and `Burn` receipts (#1259)

* ci: optimize and condense E2E tests (#1263)

* First pass; combine non-output receipt tests into one

* Combine explorer-related tests

* Combine tests that hit /ping

* Combine receipt tests again

* Finish optimization of e2e::indexing_postgres

* Remove unused replace-indexer tests from indexing_postgres

* Remove outdated, unused test from integration::service

* Condense GraphQL API E2E tests

* Use get_or_create() in test indexer

* Remove IDs checks in E2E tests

* Cleanup formatting and folder structure

* Move http_client into WebTestComponents

* Upgrade Sway version

* cargo fmt

* Adjust EXPECTED_CONTRACT_ID

* Upgrade fuels-rs to v0.45.1

* chore: upgrade to beta-4 dependencies (#1192)

* chore: upgrade to rust 1.71

* rebase origin/develop

* Bump dependencies across workspace

* Adjust fuel types in fuel-indexer-types

* Remove temp workarounds in indexer macro

* Bring in fuel-tx v0.35.3, thank you @xgreenx

* Fix most of explorer; optimize data decoding in indexer macro

* Clippy fixes

* Fix indexing_postgres e2e tests

* Manually convert contract IDs in indexer codegen

* Fix final type errors

* Upgrade fuel-indexer-tests

* Add missing fields to client schema

* Finish the upgrade...hopefully

* Upgrade to fuels-rs v0.45

* ra0x3 feedback

* Fix CI failures

---------

Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>

* refactor: swap ID from u64 to String

* update

* stuck on sizedascii serde

* updates still pending fuels-rs update

* rebase origin/feature/beta-4-release

* pending clones

* rebase origin/feature/beta-4-release

* pending test fixes

* fix bad rebase + remove redundant test stuff

* pending sdk update

* rebase origin/feature/beta-4-release

* fix bad merge

* rebase origin/develop

* fix bad rebase

* swap sizedascii to uid

* add UID as scalar

* updates

* rebase origin/develop

* get explorer working

* fix the tests

* rebase origin/develop

* update comment

* updates

* update tests

* update tests again

* test fixes

* add more clarity to schema mismatch

* deekerno feedback

---------

Co-authored-by: Alexander <alex@deekerno.com>
Co-authored-by: Rashad Alston <rashad@Rashads-Air.lan>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ra0x3 ra0x3 ra0x3 approved these changes

@lostman lostman Awaiting requested review from lostman

Assignees

@deekerno deekerno

Labels
P: High
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade dependencies for beta-4 Upgrade to rustc 1.71
2 participants
@deekerno @ra0x3