Skip to content

Commit

Permalink
Use testnet configuration for local testnet (#1894)
Browse files Browse the repository at this point in the history
Closes #1530 by using `coin`
endpoint.

- PR increased the default gas prices to be like in testnet, making
transactions much more expensive for local development. It may break
tests for downstream dependencies.
- Removed helm chart since we use operator now. Is it okay @Voxelot
@rfuelsh?
- Fixed e2e binary to work with custom `base_asset_id`.
- Fixed e2e binary to work when wallet a and wallet b have many dust
coins by suing `coin` endpoint.
- Added json version of the `non_specific_tx` to simplify its support.

## Checklist
- [x] Breaking changes are clearly marked as such in the PR description
and changelog
- [x] New behavior is reflected in tests
  • Loading branch information
xgreenx authored May 27, 2024
1 parent a7bf93b commit 82bbfa2
Show file tree
Hide file tree
Showing 45 changed files with 882 additions and 1,617 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,6 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
slack_webhook: ${{ secrets.SLACK_WEBHOOK_NOTIFY_BUILD }}

lint-helm-chart:
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v3
- name: Set up Helm
uses: azure/setup-helm@v3
with:
version: v3.10.0
- name: helm lint
run: |
cd deployment/charts
helm lint
prevent-openssl:
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
Expand Down Expand Up @@ -206,7 +193,6 @@ jobs:
needs:
- cargo-verifications
- publish-crates-check
- lint-helm-chart
runs-on: buildjet-4vcpu-ubuntu-2204
steps:
- run: echo "pass"
Expand All @@ -227,10 +213,6 @@ jobs:
mv ./dasel /usr/local/bin/dasel
./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} Cargo.toml
- name: Verify helm chart version
run: |
./.github/workflows/scripts/verify_chart_version.sh
publish-crates:
# Only do this job if publishing a release
needs:
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/scripts/verify_chart_version.sh

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [#1873](https://github.com/FuelLabs/fuel-core/pull/1873/): Separate dry runs from block production in executor code, remove `ExecutionKind` and `ExecutionType`, remove `thread_block_transaction` concept, remove `PartialBlockComponent` type, refactor away `inner` functions.
- [#1900](https://github.com/FuelLabs/fuel-core/pull/1900): Update the root README as `fuel-core run` no longer has `--chain` as an option. It has been replaced by `--snapshot`.

#### Breaking

- [#1894](https://github.com/FuelLabs/fuel-core/pull/1894): Use testnet configuration for local testnet.
- [#1894](https://github.com/FuelLabs/fuel-core/pull/1894): Removed support for helm chart.

## [Version 0.26.0]

### Fixed
Expand Down
137 changes: 68 additions & 69 deletions benches/src/default_gas_costs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,56 @@ pub fn default_gas_costs() -> GasCostsValues {
GasCostsValuesV1 {
add: 2,
addi: 2,
aloc: 1,
aloc: 2,
and: 2,
andi: 2,
bal: 366,
bal: 86,
bhei: 2,
bhsh: 2,
burn: 33949,
burn: 25770,
cb: 2,
cfei: 2,
cfsi: 2,
div: 2,
divi: 2,
eck1: 3347,
ecr1: 46165,
ed19: 4210,
eck1: 3114,
ecr1: 42270,
ed19: 2878,
eq: 2,
exp: 2,
expi: 2,
flag: 1,
gm: 2,
gt: 2,
gtf: 16,
gtf: 12,
ji: 2,
jmp: 2,
jne: 2,
jnei: 2,
jnzi: 2,
jmpf: 2,
jmpb: 2,
jnzf: 2,
jnzb: 2,
jnef: 2,
jneb: 2,
jmpf: 1,
jmpb: 1,
jnzf: 1,
jnzb: 1,
jnef: 1,
jneb: 1,
lb: 2,
log: 754,
log: 165,
lt: 2,
lw: 2,
mint: 35718,
mint: 29024,
mlog: 2,
vm_initialization: DependentCost::LightOperation {
base: 1645,
units_per_gas: 14,
vm_initialization: DependentCost::HeavyOperation {
base: 5254820,
gas_per_unit: 0,
},
modi: 2,
mod_op: 2,
movi: 2,
mroo: 5,
mroo: 4,
mul: 2,
muli: 2,
mldv: 4,
mldv: 3,
noop: 1,
not: 2,
or: 2,
Expand All @@ -63,118 +63,117 @@ pub fn default_gas_costs() -> GasCostsValues {
pshh: 4,
pshl: 4,
move_op: 2,
ret: 733,
ret: 134,
sb: 2,
sll: 2,
slli: 2,
srl: 2,
srli: 2,
srw: 253,
srw: 209,
sub: 2,
subi: 2,
sw: 2,
sww: 29053,
time: 79,
tr: 46242,
tro: 33251,
wdcm: 3,
sww: 22501,
time: 50,
tr: 33912,
tro: 24294,
wdcm: 2,
wqcm: 3,
wdop: 3,
wqop: 3,
wdml: 3,
wqml: 4,
wddv: 5,
wqdv: 7,
wdmd: 11,
wqmd: 18,
wqdv: 6,
wdmd: 10,
wqmd: 17,
wdam: 9,
wqam: 12,
wdmm: 11,
wqmm: 11,
wqam: 11,
wdmm: 10,
wqmm: 10,
xor: 2,
xori: 2,
call: DependentCost::LightOperation {
base: 21687,
units_per_gas: 4,
base: 18190,
units_per_gas: 5,
},
ccp: DependentCost::LightOperation {
base: 59,
units_per_gas: 20,
base: 48,
units_per_gas: 22,
},
// TODO: Update CROO values based on benchmarks: https://github.com/FuelLabs/fuel-core/issues/1660
croo: DependentCost::LightOperation {
base: 1,
units_per_gas: 1,
base: 131,
units_per_gas: 2,
},
csiz: DependentCost::LightOperation {
base: 59,
units_per_gas: 195,
base: 45,
units_per_gas: 237,
},
k256: DependentCost::LightOperation {
base: 282,
base: 37,
units_per_gas: 3,
},
ldc: DependentCost::LightOperation {
base: 45,
units_per_gas: 65,
base: 39,
units_per_gas: 68,
},
logd: DependentCost::LightOperation {
base: 1134,
base: 565,
units_per_gas: 2,
},
mcl: DependentCost::LightOperation {
base: 3,
units_per_gas: 523,
units_per_gas: 564,
},
mcli: DependentCost::LightOperation {
base: 3,
units_per_gas: 526,
units_per_gas: 560,
},
mcp: DependentCost::LightOperation {
base: 3,
units_per_gas: 448,
base: 4,
units_per_gas: 185,
},
mcpi: DependentCost::LightOperation {
base: 7,
units_per_gas: 585,
base: 9,
units_per_gas: 455,
},
meq: DependentCost::LightOperation {
base: 11,
units_per_gas: 1097,
base: 3,
units_per_gas: 766,
},
rvrt: 722,
rvrt: 153,
s256: DependentCost::LightOperation {
base: 45,
base: 42,
units_per_gas: 3,
},
scwq: DependentCost::HeavyOperation {
base: 30375,
gas_per_unit: 28628,
base: 21672,
gas_per_unit: 22146,
},
smo: DependentCost::LightOperation {
base: 64196,
base: 44437,
units_per_gas: 1,
},
srwq: DependentCost::HeavyOperation {
base: 262,
gas_per_unit: 249,
base: 239,
gas_per_unit: 234,
},
swwq: DependentCost::HeavyOperation {
base: 28484,
gas_per_unit: 26613,
base: 22724,
gas_per_unit: 21231,
},
contract_root: DependentCost::LightOperation {
base: 45,
units_per_gas: 1,
base: 42,
units_per_gas: 2,
},
state_root: DependentCost::HeavyOperation {
base: 350,
gas_per_unit: 176,
base: 323,
gas_per_unit: 169,
},
new_storage_per_byte: 63,
retd: DependentCost::LightOperation {
base: 1086,
units_per_gas: 2,
base: 485,
units_per_gas: 3,
},
}
.into()
Expand Down
4 changes: 2 additions & 2 deletions bin/e2e-test-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ pub fn main_body(config: SuiteConfig, mut args: Arguments) {
}),
),
Trial::test(
"dry run transaction from `non_specific_tx.raw` file",
"dry run transaction from `arbitrary_tx.raw` file",
with_cloned(&config, |config| {
async_execute(async {
let ctx = TestContext::new(config).await;
tests::script::non_specific_transaction(&ctx).await
tests::script::arbitrary_transaction(&ctx).await
})?;
Ok(())
}),
Expand Down
Loading

0 comments on commit 82bbfa2

Please sign in to comment.