search

pegnet / pegnetd

The pegnet daemon to track txs, conversions, etc
Other
13 stars 14 forks source link

fix: use int32 for executed on "get-transaction-status" #133

Closed OrmEmbaar closed 4 years ago

OrmEmbaar commented 4 years ago

fixes #132

OrmEmbaar commented 4 years ago

Can I get this reviewed and merged prior to PegNet 2.0 launch please?

OrmEmbaar commented 4 years ago

I have changed the base branch from develop to staging, as that appears to be the new development branch for this repo. As a result, commits under PR #129 also now forms part of this PR. All of those commits have already been reviewed and merged under the other branch. The only commit that has not been reviewed is 279d662.

I'd also like to say that I find it poor form to change the active development branch without forking from the previous development branch. I am just grateful there are currently no merge conflicts.

OrmEmbaar commented 4 years ago

As I explained in the comment above, this PR is moved from the develop branch, which includes commits that are not related to this PR. I didn't know what else to do, as everything is now being done on a new branch that was not forked from the previous development branch. I can change the base branch back to develop, but then it is on the wrong branch.

The only code is this PR that has not previously been reviewed/merge is 279d662.

sigrlami commented 4 years ago

@afenrir the way development done is up to the core development team. Since there are a lot of changes, we decided to have a staging branch for v2.0

sigrlami commented 4 years ago

@afenrir ok, I'll cross-check with development. Thanks