Skip to content

Commit

Permalink
feat: migration aspect
Browse files Browse the repository at this point in the history
  • Loading branch information
@gene-zhan
gene-zhan committed Oct 17, 2023
1 parent 52e14fc commit 16c856f
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 2 deletions.
34 changes: 34 additions & 0 deletions baseapp/abci.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"crypto/sha256"
"errors"
"fmt"
"github.com/artela-network/artelasdk/chaincoreext/scheduler"
"os"
"sort"
"strings"
Expand Down Expand Up @@ -230,6 +231,18 @@ func (app *BaseApp) EndBlock(req abci.RequestEndBlock) (res abci.ResponseEndBloc
panic(fmt.Errorf("EndBlock listening hook failed, height: %d, err: %w", req.Height, err))
}
}
//schedule
if scheduler.TaskInstance() != nil {
confirm, checkErr := scheduler.TaskInstance().Check()
if checkErr != nil {
app.logger.Error(
"scheduler check in EndBlock",
"height", req.Height,
"time", checkErr.Error(),
"confirm", len(confirm),
)
}
}

return res
}
Expand Down Expand Up @@ -284,6 +297,14 @@ func (app *BaseApp) PrepareProposal(req abci.RequestPrepareProposal) (resp abci.
resp = abci.ResponsePrepareProposal{Txs: req.Txs}
}
}()
chainID := app.chainID
nonce := uint64(req.Height) // use height as nonce
scheduler.NewTaskManager(req.Height, nonce, chainID)

scheduledTxs := scheduler.TaskInstance().GetTxs()
for _, scheduledTx := range scheduledTxs {
req.Txs = append(req.Txs, scheduledTx)
}

resp = app.prepareProposal(app.prepareProposalState.ctx, req)
return resp
Expand Down Expand Up @@ -343,6 +364,10 @@ func (app *BaseApp) ProcessProposal(req abci.RequestProcessProposal) (resp abci.
}
}()

//chainID := app.chainID
//nonce := uint64(req.Height) // use height as nonce
//scheduler.NewTaskManager(req.Height, nonce, chainID)

resp = app.processProposal(app.processProposalState.ctx, req)
return resp
}
Expand Down Expand Up @@ -412,6 +437,15 @@ func (app *BaseApp) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDeliv
return sdkerrors.ResponseDeliverTxWithEvents(err, gInfo.GasWanted, gInfo.GasUsed, sdk.MarkEventsToIndex(anteEvents, app.indexEvents), app.trace)
}

// scheduler remove
if scheduler.TaskInstance() != nil {
scheduleErr := scheduler.TaskInstance().Remove(req.Tx)
if scheduleErr != nil {
resultStr = "failed"
return sdkerrors.ResponseDeliverTxWithEvents(scheduleErr, gInfo.GasWanted, gInfo.GasUsed, sdk.MarkEventsToIndex(anteEvents, app.indexEvents), app.trace)
}
}

return abci.ResponseDeliverTx{
GasWanted: int64(gInfo.GasWanted), // TODO: Should type accept unsigned ints?
GasUsed: int64(gInfo.GasUsed), // TODO: Should type accept unsigned ints?
Expand Down
2 changes: 1 addition & 1 deletion simapp/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ require (
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/orderedcode v0.0.1 // indirect
Expand Down
1 change: 1 addition & 0 deletions simapp/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/orderedcode v0.0.1 // indirect
Expand Down
1 change: 1 addition & 0 deletions tests/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
Expand Down

0 comments on commit 16c856f

Please sign in to comment.