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

Bump env version, update cost parameters #3876

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Bump env version, update cost parameters #3876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb21d6
Bump env version, update cost parameters
jayz22 Aug 10, 2023
2a5c1da
Bump env again to fix autobump bug
sisuresh Aug 10, 2023
652cac1
Make minimum MAXIMUM_ENTRY_LIFETIME 31 days
sisuresh Aug 10, 2023
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
38 changes: 24 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

92 changes: 39 additions & 53 deletions src/ledger/NetworkConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,99 +227,92 @@ initialCpuCostParamsEntry(Config const& cfg)
switch (val)
{
case WasmInsnExec:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 7, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 6, 0};
break;

case WasmMemAlloc:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case HostMemAlloc:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2350, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1141, 1};
break;
case HostMemCpy:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 23, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 39, 24};
break;
case HostMemCmp:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 43, 1};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 20, 64};
break;
case InvokeHostFunction:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 928, 0};
case DispatchHostFunction:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 263, 0};
break;
case VisitObject:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 19, 0};
break;
case ValXdrConv:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 134, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 108, 0};
break;
case ValSer:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 587, 1};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 591, 69};
break;
case ValDeser:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 870, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1112, 34};
break;
case ComputeSha256Hash:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1725, 33};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2924, 4149};
break;
case ComputeEd25519PubKey:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 25551, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 25584, 0};
break;
case MapEntry:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 53, 0};
break;
case VecEntry:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 5, 0};
break;
case GuardFrame:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 4050, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case VerifyEd25519Sig:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 369634, 21};
params[val] =
ContractCostParamEntry{ExtensionPoint{0}, 376877, 2747};
break;
case VmMemRead:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 182, 24};
break;
case VmMemWrite:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 124, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 182, 24};
break;
case VmInstantiation:
params[val] =
ContractCostParamEntry{ExtensionPoint{0}, 600447, 484};
ContractCostParamEntry{ExtensionPoint{0}, 967154, 69991};
break;
case VmCachedInstantiation:
params[val] =
ContractCostParamEntry{ExtensionPoint{0}, 600447, 484};
ContractCostParamEntry{ExtensionPoint{0}, 967154, 69991};
break;
case InvokeVmFunction:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 5926, 0};
break;
case ChargeBudget:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 130, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1125, 0};
break;
case ComputeKeccak256Hash:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 3322, 46};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2890, 3561};
break;
case ComputeEcdsaSecp256k1Key:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 56525, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 38363, 0};
break;
case ComputeEcdsaSecp256k1Sig:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 250, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 224, 0};
break;
case RecoverEcdsaSecp256k1Key:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2319640, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1666155, 0};
break;
case Int256AddSub:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 735, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1716, 0};
break;
case Int256Mul:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1224, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2226, 0};
break;
case Int256Div:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1347, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 2333, 0};
break;
case Int256Pow:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 5350, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 5212, 0};
break;
case Int256Shift:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 538, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 412, 0};
break;
}
}
Expand Down Expand Up @@ -380,28 +373,25 @@ initialMemCostParamsEntry(Config const& cfg)
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 1, 0};
break;
case HostMemAlloc:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 8, 1};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 16, 128};
break;
case HostMemCpy:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case HostMemCmp:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case InvokeHostFunction:
case DispatchHostFunction:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case VisitObject:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case ValXdrConv:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case ValSer:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 9, 3};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 18, 384};
break;
case ValDeser:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 4, 1};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 16, 128};
break;
case ComputeSha256Hash:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 40, 0};
Expand All @@ -415,9 +405,6 @@ initialMemCostParamsEntry(Config const& cfg)
case VecEntry:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case GuardFrame:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 472, 0};
break;
case VerifyEd25519Sig:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
Expand All @@ -428,16 +415,15 @@ initialMemCostParamsEntry(Config const& cfg)
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case VmInstantiation:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 117871, 40};
params[val] =
ContractCostParamEntry{ExtensionPoint{0}, 131103, 5080};
break;
case VmCachedInstantiation:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 117871, 40};
params[val] =
ContractCostParamEntry{ExtensionPoint{0}, 131103, 5080};
break;
case InvokeVmFunction:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 486, 0};
break;
case ChargeBudget:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 14, 0};
break;
case ComputeKeccak256Hash:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 40, 0};
Expand All @@ -449,7 +435,7 @@ initialMemCostParamsEntry(Config const& cfg)
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 0, 0};
break;
case RecoverEcdsaSecp256k1Key:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 181, 0};
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 201, 0};
break;
case Int256AddSub:
params[val] = ContractCostParamEntry{ExtensionPoint{0}, 119, 0};
Expand Down
2 changes: 1 addition & 1 deletion src/protocol-next/xdr
Open in desktop
Submodule xdr updated 1 files
+42 −35 Stellar-contract-config-setting.x
6 changes: 3 additions & 3 deletions src/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ rustc-simple-version = "0.1.0"
version = "0.0.17"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "2069b9c10541126f7812c6f807006dfc8470ab3f"
rev = "844b6abc461594027158a7bb5643447d0f90a81e"

# This copy of the soroban host is _optional_ and only enabled during protocol
# transitions. When transitioning from protocol N to N+1, the `curr` copy
Expand All @@ -52,11 +52,11 @@ optional = true
version = "0.0.17"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "75c043970e9098952848c8dd97e532b86ce78a8f"
rev = "2069b9c10541126f7812c6f807006dfc8470ab3f"

[dependencies.soroban-test-wasms]
git = "https://github.com/stellar/rs-soroban-env"
rev = "2069b9c10541126f7812c6f807006dfc8470ab3f"
rev = "844b6abc461594027158a7bb5643447d0f90a81e"

[dependencies.cargo-lock]
git = "https://github.com/rustsec/rustsec"
Expand Down
4 changes: 2 additions & 2 deletions src/rust/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,15 @@ fn invoke_host_function_or_maybe_panic(
let client = tracy_client::Client::start();
let _span0 = tracy_span!("invoke_host_function_or_maybe_panic");

let budget = Budget::from_configs(
let budget = Budget::try_from_configs(
instruction_limit as u64,
ledger_info.memory_limit as u64,
// These are the only non-metered XDR conversions that we perform. They
// have a small constant cost that is independent of the user-provided
// data.
non_metered_xdr_from_cxx_buf::<ContractCostParams>(&ledger_info.cpu_cost_params)?,
non_metered_xdr_from_cxx_buf::<ContractCostParams>(&ledger_info.mem_cost_params)?,
);
)?;
let mut diagnostic_events = vec![];
let ledger_seq_num = ledger_info.sequence_number;
let (res, time_nsecs) = {
Expand Down
Loading
Loading