Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
17
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
557447b6
Commit
557447b6
authored
3 months ago
by
Constantin P.
💬
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix-14796' into 'master'
hotfix-14796 See merge request
!1990
parents
2b7acb4d
c9a13576
No related branches found
No related tags found
1 merge request
!1990
hotfix-14796
Pipeline
#49356
passed with stage
in 11 minutes and 15 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/net/dap_chain_net_decree.c
+13
-4
13 additions, 4 deletions
modules/net/dap_chain_net_decree.c
with
13 additions
and
4 deletions
modules/net/dap_chain_net_decree.c
+
13
−
4
View file @
557447b6
...
@@ -374,6 +374,19 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
...
@@ -374,6 +374,19 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
switch
(
a_decree
->
header
.
sub_type
)
switch
(
a_decree
->
header
.
sub_type
)
{
{
case
DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_FEE
:
case
DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_FEE
:
// if (dap_chain_datum_decree_get_fee_addr(a_decree, &l_addr)) {
// if (dap_chain_addr_is_blank(&a_net->pub.fee_addr)) {
// log_it(L_WARNING, "Fee wallet address not set.");
// return -111;
// } else
// l_addr = a_net->pub.fee_addr;
// }
if
(
dap_chain_datum_decree_get_fee
(
a_decree
,
&
l_value
))
{
log_it
(
L_WARNING
,
"Can't get fee value from decree."
);
return
-
103
;
}
if
(
!
a_anchored
)
break
;
if
(
dap_chain_datum_decree_get_fee_addr
(
a_decree
,
&
l_addr
))
{
if
(
dap_chain_datum_decree_get_fee_addr
(
a_decree
,
&
l_addr
))
{
if
(
dap_chain_addr_is_blank
(
&
a_net
->
pub
.
fee_addr
))
{
if
(
dap_chain_addr_is_blank
(
&
a_net
->
pub
.
fee_addr
))
{
log_it
(
L_WARNING
,
"Fee wallet address not set."
);
log_it
(
L_WARNING
,
"Fee wallet address not set."
);
...
@@ -381,10 +394,6 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
...
@@ -381,10 +394,6 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
}
else
}
else
l_addr
=
a_net
->
pub
.
fee_addr
;
l_addr
=
a_net
->
pub
.
fee_addr
;
}
}
if
(
dap_chain_datum_decree_get_fee
(
a_decree
,
&
l_value
))
{
log_it
(
L_WARNING
,
"Can't get fee value from decree."
);
return
-
103
;
}
if
(
!
a_apply
)
if
(
!
a_apply
)
break
;
break
;
if
(
!
dap_chain_net_tx_set_fee
(
a_net
->
pub
.
id
,
l_value
,
l_addr
))
if
(
!
dap_chain_net_tx_set_fee
(
a_net
->
pub
.
id
,
l_value
,
l_addr
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment