Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix EasyGas error code and add v12 release #245

Merged
merged 1 commit into from
Aug 22, 2023
Merged

fix EasyGas error code and add v12 release #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ compiled_package_info:
StarcoinAssociation: "0x0000000000000000000000000a550c18"
StarcoinFramework: "0x00000000000000000000000000000001"
VMReserved: "0x00000000000000000000000000000000"
source_digest: 43D3D1EFB0689A52B0DADED8DDB3DED2C03C392683B42CE1E28CE538D1F7CA6E
source_digest: FE212729EBF6A8DBC3934A155AE1FB2DA968820E6F59159E2235D0E6123C0B74
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/EasyGas.mv
View file
Open in desktop
Binary file not shown.
Binary file modified build/StarcoinFramework/source_maps/EasyGas.mvsm
View file
Open in desktop
Binary file not shown.
Binary file modified build/StarcoinFramework/source_maps/EasyGasScript.mvsm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion release/v12/BuildInfo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ compiled_package_info:
StarcoinAssociation: "0x0000000000000000000000000a550c18"
StarcoinFramework: "0x00000000000000000000000000000001"
VMReserved: "0x00000000000000000000000000000000"
source_digest: 43D3D1EFB0689A52B0DADED8DDB3DED2C03C392683B42CE1E28CE538D1F7CA6E
source_digest: FE212729EBF6A8DBC3934A155AE1FB2DA968820E6F59159E2235D0E6123C0B74
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified release/v12/bytecode_modules/EasyGas.mv
View file
Open in desktop
Binary file not shown.
Binary file modified release/v12/source_maps/EasyGas.mvsm
View file
Open in desktop
Binary file not shown.
Binary file modified release/v12/source_maps/EasyGasScript.mvsm
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion release/v12/sources/EasyGas.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module EasyGas {
use StarcoinFramework::CoreAddresses;
use StarcoinFramework::GenesisSignerCapability;
use StarcoinFramework::PriceOracle;
use StarcoinFramework::Errors;

const EBAD_TRANSACTION_FEE_TOKEN: u64 = 18;
struct STCToken<phantom TokenType: store> has copy, store, drop {}

Expand Down Expand Up @@ -83,7 +85,7 @@ module EasyGas {
let gas_token_entry = borrow_global<GasTokenEntry>(genesis);
assert!(module_name(&token_type_info) == *&gas_token_entry.module_name && account_address(
&token_type_info
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, EBAD_TRANSACTION_FEE_TOKEN);
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, Errors::invalid_argument(EBAD_TRANSACTION_FEE_TOKEN));
gas_token_entry.data_source
}

Expand Down
4 changes: 3 additions & 1 deletion release/v12/sources/EasyGasScript.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module EasyGas {
use StarcoinFramework::CoreAddresses;
use StarcoinFramework::GenesisSignerCapability;
use StarcoinFramework::PriceOracle;
use StarcoinFramework::Errors;

const EBAD_TRANSACTION_FEE_TOKEN: u64 = 18;
struct STCToken<phantom TokenType: store> has copy, store, drop {}

Expand Down Expand Up @@ -83,7 +85,7 @@ module EasyGas {
let gas_token_entry = borrow_global<GasTokenEntry>(genesis);
assert!(module_name(&token_type_info) == *&gas_token_entry.module_name && account_address(
&token_type_info
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, EBAD_TRANSACTION_FEE_TOKEN);
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, Errors::invalid_argument(EBAD_TRANSACTION_FEE_TOKEN));
gas_token_entry.data_source
}

Expand Down
4 changes: 3 additions & 1 deletion sources/EasyGas.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module EasyGas {
use StarcoinFramework::CoreAddresses;
use StarcoinFramework::GenesisSignerCapability;
use StarcoinFramework::PriceOracle;
use StarcoinFramework::Errors;

const EBAD_TRANSACTION_FEE_TOKEN: u64 = 18;
struct STCToken<phantom TokenType: store> has copy, store, drop {}

Expand Down Expand Up @@ -83,7 +85,7 @@ module EasyGas {
let gas_token_entry = borrow_global<GasTokenEntry>(genesis);
assert!(module_name(&token_type_info) == *&gas_token_entry.module_name && account_address(
&token_type_info
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, EBAD_TRANSACTION_FEE_TOKEN);
) == *&gas_token_entry.account_address && struct_name(&token_type_info) == *&gas_token_entry.struct_name, Errors::invalid_argument(EBAD_TRANSACTION_FEE_TOKEN));
gas_token_entry.data_source
}

Expand Down
Loading