diff --git a/CHANGELOG.md b/CHANGELOG.md index 24aa50754b..2fca3e2660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). #### Breaking - [#683](https://github.com/FuelLabs/fuel-vm/pull/683): Simplify `InterpreterStorage` by removing dependency on `MerkleRootStorage` and removing `merkle_` prefix from method names. +- [#678](https://github.com/FuelLabs/fuel-vm/pull/678): Zero malleable fields before execution. Remove some now-obsolete GTF getters. Don't update `tx.receiptsRoot` after pushing receipts, and do it after execution instead. - [#672](https://github.com/FuelLabs/fuel-vm/pull/672): Remove `GasPrice` policy - [#672](https://github.com/FuelLabs/fuel-vm/pull/672): Add `gas_price` field to transaction execution - [#684](https://github.com/FuelLabs/fuel-vm/pull/684): Remove `maturity` field from `Input` coin types. Also remove related `GTF` getter. diff --git a/fuel-asm/src/args.rs b/fuel-asm/src/args.rs index f8300f1076..518121846f 100644 --- a/fuel-asm/src/args.rs +++ b/fuel-asm/src/args.rs @@ -164,15 +164,6 @@ crate::enum_try_from! { /// Set `$rA` to `tx.inputs[$rB].outputIndex` InputContractOutputIndex = 0x221, - /// Set `$rA` to `Memory address of tx.inputs[$rB].balanceRoot` - InputContractBalanceRoot = 0x222, - - /// Set `$rA` to `Memory address of tx.inputs[$rB].stateRoot` - InputContractStateRoot = 0x223, - - /// Set `$rA` to `Memory address of tx.inputs[$rB].txPointer` - InputContractTxPointer = 0x224, - /// Set `$rA` to `Memory address of tx.inputs[$rB].contractID` InputContractId = 0x225, @@ -227,12 +218,6 @@ crate::enum_try_from! { /// Set `$rA` to `tx.outputs[$rB].inputIndex` OutputContractInputIndex = 0x304, - /// Set `$rA` to `Memory address of tx.outputs[$rB].balanceRoot` - OutputContractBalanceRoot = 0x305, - - /// Set `$rA` to `Memory address of tx.outputs[$rB].stateRoot` - OutputContractStateRoot = 0x306, - /// Set `$rA` to `Memory address of tx.outputs[$rB].contractID` OutputContractCreatedContractId = 0x307, @@ -328,11 +313,6 @@ fn encode_gtf_args() { GTFArgs::InputCoinPredicate, GTFArgs::InputCoinPredicateData, GTFArgs::InputCoinPredicateGasUsed, - GTFArgs::InputContractTxId, - GTFArgs::InputContractOutputIndex, - GTFArgs::InputContractBalanceRoot, - GTFArgs::InputContractStateRoot, - GTFArgs::InputContractTxPointer, GTFArgs::InputContractId, GTFArgs::InputMessageSender, GTFArgs::InputMessageRecipient, @@ -351,8 +331,6 @@ fn encode_gtf_args() { GTFArgs::OutputCoinAmount, GTFArgs::OutputCoinAssetId, GTFArgs::OutputContractInputIndex, - GTFArgs::OutputContractBalanceRoot, - GTFArgs::OutputContractStateRoot, GTFArgs::OutputContractCreatedContractId, GTFArgs::OutputContractCreatedStateRoot, GTFArgs::WitnessDataLength, diff --git a/fuel-tx/src/builder.rs b/fuel-tx/src/builder.rs index aa09a4ac0f..1d57ce9a87 100644 --- a/fuel-tx/src/builder.rs +++ b/fuel-tx/src/builder.rs @@ -103,8 +103,6 @@ impl Buildable for T where T: BuildableSet {} pub struct TransactionBuilder { tx: Tx, - should_prepare_script: bool, - should_prepare_predicate: bool, params: ConsensusParameters, // We take the key by reference so this lib won't have the responsibility to properly @@ -126,12 +124,7 @@ impl TransactionBuilder