feat: add beta-4 target, and point --testnet to beta-4 network for forc-deploy #4974

kayagokalp · 2023-08-17T21:36:44Z

Description

closes #4973.

waiting for #4972 to be merged first.

With this PR, we are now adding --target beta-4 and alias --testnet to --target beta-4 so that users can deploy to beta-4 with just providing --tesnet flag.

forc-deploy --testnet
 Compiling library core (/Users/kayagokalp/.forc/git/checkouts/std-9be0d6062747ea7/04a597093e7441898933dd412b8e4dc6ac860cd3/sway-lib-core)
 Compiling library std (git+https://github.com/fuellabs/sway?tag=v0.44.1#04a597093e7441898933dd412b8e4dc6ac860cd3)
 Compiling contract deploy-to-beta-4 (/Users/kayagokalp/fuel/test_projects/deploy-to-beta-4)
  Finished debug in 4.57878525s
  contract deploy-to-beta-4
      Bytecode size: 68 bytes

Please provide the password of your encrypted wallet vault at "/Users/kayagokalp/.fuel/wallets/.wallet": 

Account 0 -- fuel18caanqmumttfnm8qp0eq7u9yluydxtqmzuaqtzdjlsww5t2jmg9skutn8n:
  Asset ID                                                           Amount
  0000000000000000000000000000000000000000000000000000000000000000 499999960

Please provide the index of account to use for signing: 0
Do you agree to sign this transaction with fuel18caanqmumttfnm8qp0eq7u9yluydxtqmzuaqtzdjlsww5t2jmg9skutn8n? [y/N]: y


Contract deploy-to-beta-4 Deployed!

Network: beta-4.fuel.network/graphql
Contract ID: 0x7e59d984c57b01ef3ffb873781e938fb389f57e14fa4553c54f730a54a6016ec
Deployed in block 0x7d8238d863ece8d3dfb62eae9341ea66b42545b4edcc41265f1f183394d5d717

kayagokalp · 2023-08-17T21:37:36Z

We should point this PR to master once we have #4972 merged.

Voxelot · 2023-08-17T21:44:53Z

In the future is there a way we could dynamically update this via a config file we host somewhere (ie. github) instead of needing to make new releases of forc?

forc-plugins/forc-client/src/util/mod.rs

docs/book/src/forc/plugins/forc_client/index.md

forc-plugins/forc-client/src/op/deploy.rs

kayagokalp · 2023-08-17T22:20:16Z

In the future is there a way we could dynamically update this via a config file we host somewhere (ie. github) instead of needing to make new releases of forc?

Yeah that is definitely a better idea. Opened #4975.

Co-authored-by: Sophie Dankel <47993817+sdankel@users.noreply.github.com>

forc-plugins/forc-client/src/util/mod.rs

docs/book/src/forc/plugins/forc_client/index.md

Co-authored-by: Joshua Batty <joshpbatty@gmail.com>

JoshuaBatty

utACK, looks good though.

forc-plugins/forc-client/src/op/deploy.rs

sdankel

Should we also add tests for beta-4?

forc-plugins/forc-client/src/op/deploy.rs

sdankel · 2023-08-18T21:59:45Z

forc-plugins/forc-client/src/op/deploy.rs

+            testnet: false,
+            gas: Gas {
+                price: 1,
+                limit: 100000000,


Added some unit tests to show the current behavior - still don't understand the logic behind overriding the gas limit for beta-4.

Thanks so much for adding the tests 💯 I am not sure why this is only needed for beta4 but the default max gas limit returns:

Error: Decode error: Custom { kind: Other, error: "Response errors; TransactionGasLimit" }

This is not the case for other beta networks.

If i change the default value, beta-3 and beta-2 would break, so I patched it only for beta-4 and if users provide gas_limit their gas_limit will override our preset value (unless they specified the max value, but again providing max value for gas limit returns the error above). This is not ideal but it enables to deploy without specifying any other flags.

Also I imagine this feature is only for beta networks for mainnet we would require users to specify --gas-limit and --gas-price by themselves (or if there is a way to estimate gas-limit using SDK, we can explore that later on as well)

I'm just wondering if there's a more appropriate gas limit than 1. Does a gas limit of 1 work actually work for any transactions?

We might want to fix the issue with the default gas limit in forc-tx rather than overriding it in forc-deploy.

We now ask the test net for min gas price if the user left it as 0 by default. The testnet returns the accepted min gas price and we use that instead of 0 so that the transaction is valid.

We do the same thing for gas_limit if they left as the default max value, we ask the chain the valid max value and use it instead, so that we do not exceed the limit set by the node.

I think that while deploying to test net we can override this as we want the transactions to be valid by default and if the user choses to be providing the extremes we can use the extreme set by the node instead. Maybe I can add a warning to notify them?

On a second thought modiying this rn to make sure we do not override any user given data. If the user wants to override the default data returned by the node they can. Maybe they would want to test some stuff around that

sdankel · 2023-08-22T00:44:20Z

forc-plugins/forc-tx/src/lib.rs

+            create
+                .gas
+                .limit
+                .unwrap_or(fuel_tx::ConsensusParameters::DEFAULT.max_gas_per_tx),


Should we be using the defaults from the node here as well?

Actually it seems like forc-tx doesn't specify the node, so there's no way to use the node's defaults

…4991) ## Description Closes #4974 Added the beta-4 target and updated documentation (from #4974) Refactored part of forc-deploy and added unit tests. - No longer mutating the Command, so the Command is always whatever the user gave us - Using the default values from the node itself via API call, rather than hardcoded constants - The values of `Gas` are now optional, so we only override them when the user hasn't specified anything Other changes: - deployment works using the urls without `/graphql` prefixes, so I updated the constants to remove the prefix. This is shown to the user and it looks cleaner without it. - Added coloring and consistent styling for errors and warnings to printed to the console. It looks like this now (previously no color) - `deploy`, `run`, and `submit` all now have the same options for specifying the node (node_url, testnet, and target), capture in the `TargetNode` struct. They use the same helper functions to extract the node url and determine gas limit & price. ![image](https://github.com/FuelLabs/sway/assets/47993817/711382e4-c79e-49f0-85a3-b75704f7af9d) ## Checklist - [ ] I have linked to any relevant issues. - [ ] I have commented my code, particularly in hard-to-understand areas. - [ ] I have updated the documentation where relevant (API docs, the reference, and the Sway book). - [ ] I have added tests that prove my fix is effective or that my feature works. - [ ] I have added (or requested a maintainer to add) the necessary `Breaking*` or `New Feature` labels where relevant. - [ ] I have done my best to ensure that my PR adheres to [the Fuel Labs Code Review Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md). - [ ] I have requested a review from the relevant team or maintainers. --------- Co-authored-by: kayagokalp <kaya.gokalp@fuel.sh> Co-authored-by: Joshua Batty <joshpbatty@gmail.com>

kayagokalp added 2 commits August 17, 2023 21:38

feat: derive first account with forc-deploy after creating a wallet

023e2c8

feat: point empty accounts to beta-4 faucet

354409b

kayagokalp added enhancement New feature or request forc-deploy Everything to do with forc-deploy labels Aug 17, 2023

kayagokalp self-assigned this Aug 17, 2023

kayagokalp changed the base branch from master to kayagokalp/4862 August 17, 2023 21:37

kayagokalp marked this pull request as ready for review August 17, 2023 21:37

kayagokalp requested a review from a team August 17, 2023 21:37

Merge branch 'master' into kayagokalp/4862

551c4ac

sdankel reviewed Aug 17, 2023

View reviewed changes

forc-plugins/forc-client/src/util/mod.rs Outdated Show resolved Hide resolved

sdankel reviewed Aug 17, 2023

View reviewed changes

docs/book/src/forc/plugins/forc_client/index.md Outdated Show resolved Hide resolved

sdankel reviewed Aug 17, 2023

View reviewed changes

docs/book/src/forc/plugins/forc_client/index.md Outdated Show resolved Hide resolved

kayagokalp mentioned this pull request Aug 17, 2023

Host forc-deploy targets in github so that they can be updated without cutting a new release #4975

Open

sdankel reviewed Aug 17, 2023

View reviewed changes

forc-plugins/forc-client/src/op/deploy.rs Outdated Show resolved Hide resolved

kayagokalp requested a review from sdankel August 17, 2023 22:28

kayagokalp and others added 4 commits August 18, 2023 01:29

feat: add beta-4 target, and point --testnet to beta-4 network

88b4bf5

docs: update docs to point out --testnet flag

28c9bbe

Apply suggestions from code review

362110b

Co-authored-by: Sophie Dankel <47993817+sdankel@users.noreply.github.com>

fix: check if --node-url is present

b354148

kayagokalp force-pushed the kayagokalp/4973 branch from 9494cf2 to b354148 Compare August 17, 2023 22:29

kayagokalp requested a review from a team August 17, 2023 22:30

sdankel reviewed Aug 17, 2023

View reviewed changes

forc-plugins/forc-client/src/util/mod.rs Outdated Show resolved Hide resolved

sdankel reviewed Aug 17, 2023

View reviewed changes

forc-plugins/forc-client/src/util/mod.rs Outdated Show resolved Hide resolved

Base automatically changed from kayagokalp/4862 to master August 18, 2023 04:29

kayagokalp added 2 commits August 18, 2023 13:07

Merge branch 'master' into kayagokalp/4973

21360da

chore: clean fromstr and display impls, change LATEST to Local

07d7bf3

kayagokalp enabled auto-merge (squash) August 18, 2023 10:14

kayagokalp requested review from sdankel, JoshuaBatty, eureka-cpu and a team August 18, 2023 10:14

JoshuaBatty reviewed Aug 18, 2023

View reviewed changes

docs/book/src/forc/plugins/forc_client/index.md Outdated Show resolved Hide resolved

Update docs/book/src/forc/plugins/forc_client/index.md

8768f1f

Co-authored-by: Joshua Batty <joshpbatty@gmail.com>

kayagokalp requested a review from JoshuaBatty August 18, 2023 10:27

JoshuaBatty previously approved these changes Aug 18, 2023

View reviewed changes

kayagokalp requested a review from a team August 18, 2023 14:21

kayagokalp mentioned this pull request Aug 18, 2023

Bump to v0.44.2 #4980

Closed

sdankel reviewed Aug 18, 2023

View reviewed changes

forc-plugins/forc-client/src/op/deploy.rs Outdated Show resolved Hide resolved

sdankel reviewed Aug 18, 2023

View reviewed changes

refactor for readability

7424c60

sdankel dismissed JoshuaBatty’s stale review via 7424c60 August 18, 2023 21:26

sdankel reviewed Aug 18, 2023

View reviewed changes

forc-plugins/forc-client/src/op/deploy.rs Outdated Show resolved Hide resolved

Add unit tests

794160d

sdankel reviewed Aug 18, 2023

View reviewed changes

kayagokalp requested review from sdankel and JoshuaBatty August 21, 2023 10:33

sdankel and others added 3 commits August 21, 2023 13:19

Merge branch 'master' into kayagokalp/4973

cd2799f

query chain for max gas per tx and min gas price

f27aa4f

only override gas values if user did not specify them

9f2437c

sdankel mentioned this pull request Aug 21, 2023

Add beta-4 target to forc, refactor with tests, and UX improvements #4991

Merged

7 tasks

sdankel reviewed Aug 22, 2023

View reviewed changes

sdankel closed this in #4991 Aug 23, 2023

auto-merge was automatically disabled August 23, 2023 15:21
Pull request was closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add beta-4 target, and point --testnet to beta-4 network for forc-deploy #4974

feat: add beta-4 target, and point --testnet to beta-4 network for forc-deploy #4974

kayagokalp commented Aug 17, 2023

kayagokalp commented Aug 17, 2023

Voxelot commented Aug 17, 2023

kayagokalp commented Aug 17, 2023

JoshuaBatty left a comment

sdankel left a comment

sdankel Aug 18, 2023 •

edited

Loading

kayagokalp Aug 20, 2023 •

edited

Loading

sdankel Aug 21, 2023 •

edited

Loading

kayagokalp Aug 21, 2023

kayagokalp Aug 21, 2023

sdankel Aug 22, 2023

sdankel Aug 22, 2023

feat: add beta-4 target, and point --testnet to beta-4 network for forc-deploy #4974

feat: add beta-4 target, and point --testnet to beta-4 network for forc-deploy #4974

Conversation

kayagokalp commented Aug 17, 2023

Description

kayagokalp commented Aug 17, 2023

Voxelot commented Aug 17, 2023

kayagokalp commented Aug 17, 2023

JoshuaBatty left a comment

Choose a reason for hiding this comment

sdankel left a comment

Choose a reason for hiding this comment

sdankel Aug 18, 2023 • edited Loading

Choose a reason for hiding this comment

kayagokalp Aug 20, 2023 • edited Loading

Choose a reason for hiding this comment

sdankel Aug 21, 2023 • edited Loading

Choose a reason for hiding this comment

kayagokalp Aug 21, 2023

Choose a reason for hiding this comment

kayagokalp Aug 21, 2023

Choose a reason for hiding this comment

sdankel Aug 22, 2023

Choose a reason for hiding this comment

sdankel Aug 22, 2023

Choose a reason for hiding this comment

sdankel Aug 18, 2023 •

edited

Loading

kayagokalp Aug 20, 2023 •

edited

Loading

sdankel Aug 21, 2023 •

edited

Loading