Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/fierce_fermion_6.2RC' in…
Browse files Browse the repository at this point in the history 
…to mainnet
  • Loading branch information
@anatolse
anatolse committed Dec 15, 2021
2 parents 8493227 + 17d45b9 commit 36522bc
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 8 deletions.
24 changes: 22 additions & 2 deletions bvm/Shaders/dao-core-masternet/app.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,16 @@ ON_METHOD(manager, prealloc_withdraw)
fc.m_Amount = amount;
fc.m_Consume = 0;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock +
Env::Cost::AddSig +
(Env::Cost::Cycle * 1000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", nCharge);
}

void GetFarmingState(const ContractID& cid, DaoCore::Farming::State& fs)
Expand Down Expand Up @@ -416,7 +425,18 @@ ON_METHOD(manager, farm_update)
pFc[1].m_Amount = amountBeam;
pFc[1].m_Consume = bLockOrUnlock;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock * 2 +
Env::Cost::AddSig +
(Env::Cost::Cycle * 2000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", nCharge);

}

Expand Down
Binary file modified bvm/Shaders/dao-core-masternet/app.wasm
View file
Binary file not shown.
24 changes: 22 additions & 2 deletions bvm/Shaders/dao-core-testnet/app.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,16 @@ ON_METHOD(manager, prealloc_withdraw)
fc.m_Amount = amount;
fc.m_Consume = 0;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock +
Env::Cost::AddSig +
(Env::Cost::Cycle * 1000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", nCharge);
}

void GetFarmingState(const ContractID& cid, DaoCore::Farming::State& fs)
Expand Down Expand Up @@ -416,7 +425,18 @@ ON_METHOD(manager, farm_update)
pFc[1].m_Amount = amountBeam;
pFc[1].m_Consume = bLockOrUnlock;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock * 2 +
Env::Cost::AddSig +
(Env::Cost::Cycle * 2000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", nCharge);

}

Expand Down
Binary file modified bvm/Shaders/dao-core-testnet/app.wasm
View file
Binary file not shown.
24 changes: 22 additions & 2 deletions bvm/Shaders/dao-core/app.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,16 @@ ON_METHOD(manager, prealloc_withdraw)
fc.m_Amount = amount;
fc.m_Consume = 0;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Preallocated::User)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock +
Env::Cost::AddSig +
(Env::Cost::Cycle * 1000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), &fc, 1, &sig, 1, "Get preallocated beamX tokens", nCharge);
}

void GetFarmingState(const ContractID& cid, DaoCore::Farming::State& fs)
Expand Down Expand Up @@ -416,7 +425,18 @@ ON_METHOD(manager, farm_update)
pFc[1].m_Amount = amountBeam;
pFc[1].m_Consume = bLockOrUnlock;

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", 0);
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::UserPos)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::SaveVar_For(sizeof(DaoCore::Farming::State)) +
Env::Cost::LoadVar_For(sizeof(DaoCore::State)) +
Env::Cost::FundsLock * 2 +
Env::Cost::AddSig +
(Env::Cost::Cycle * 2000);

Env::GenerateKernel(&cid, arg.s_iMethod, &arg, sizeof(arg), pFc, _countof(pFc), &sig, 1, "Lock/Unlock and get farmed beamX tokens", nCharge);

}

Expand Down
Binary file modified bvm/Shaders/dao-core/app.wasm
View file
Binary file not shown.
19 changes: 17 additions & 2 deletions bvm/Shaders/gallery/app.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,23 @@ ON_METHOD(manager, upload)
// - event for the data. This is 100 units per byte, plus 5K units per call, which is repeated for each 8K of data
// - add some extra for other stuff

uint32_t nCharge = 90000;
nCharge += nDataLen * 110;
uint32_t nCharge =
ManagerUpgadable2::get_ChargeInvoke() +
Env::Cost::LoadVar_For(sizeof(Gallery::State)) +
Env::Cost::SaveVar_For(sizeof(Gallery::State)) +
Env::Cost::LoadVar_For(sizeof(Gallery::Artist)) +
Env::Cost::SaveVar_For(sizeof(Gallery::Masterpiece)) +
Env::Cost::AddSig +
Env::Cost::Cycle * 200;

const uint32_t nSizeEvt = 0x2000;
uint32_t nFullCycles = nDataLen / nSizeEvt;

nCharge += (Env::Cost::Log_For(nSizeEvt) + Env::Cost::Cycle * 50) * nFullCycles;

nDataLen %= nSizeEvt;
if (nDataLen)
nCharge += Env::Cost::Log_For(nDataLen) + Env::Cost::Cycle * 50;

Env::GenerateKernel(&cid, pArgs->s_iMethod, pArgs, nSizeArgs, nullptr, 0, &sig, 1, "Gallery upload masterpiece", nCharge);

Expand Down
Binary file modified bvm/Shaders/gallery/app.wasm
View file
Binary file not shown.

0 comments on commit 36522bc

Please sign in to comment.