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.

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

Merge in umee peggo #5

Merged
merged 65 commits into from
Nov 15, 2021
Merged

Merge in umee peggo #5

merged 65 commits into from
Nov 15, 2021

Conversation

liamsi
Copy link
Member

@liamsi liamsi commented Nov 13, 2021

This repo was based on https://github.com/InjectiveLabs/peggo
This PR merges in all changes from https://github.com/umee-network/peggo as it contains a bunch of updates and fixes (tooling, deps, tests etc). The smart-contracts are untouched so it should not impact the work @adlerjohn started.

Please do not squash

alexanderbez and others added 20 commits November 2, 2021 09:33
Bumps [github.com/knadh/koanf](https://github.com/knadh/koanf) from 1.3.0 to 1.3.1.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/knadh/koanf/commit/a448a38a95083c98a99ddeebeb7c55d871329238"><code>a448a38</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/knadh/koanf/issues/116">#116</a> from rhnvrm/fix-s3-err</li>
<li><a href="https://github.com/knadh/koanf/commit/14b8037eaf0fa7caa6e335fab645c0f7a1d5db63"><code>14b8037</code></a> fix: incorrect warning log in case of s3 file-dl</li>
<li>See full diff in <a href="https://github.com/knadh/koanf/compare/v1.3.0...v1.3.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/knadh/koanf&package-manager=go_modules&previous-version=1.3.0&new-version=1.3.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>
Bumps [github.com/knadh/koanf](https://github.com/knadh/koanf) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/knadh/koanf/releases)
- [Commits](knadh/koanf@v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: github.com/knadh/koanf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
* add erc20 decimals query when calculating fees

* Apply suggestions from code review

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update orchestrator/main_loops.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* add comment about casting uint8 into int32

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
)

Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.10.11 to 1.10.12.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/ethereum/go-ethereum/releases">github.com/ethereum/go-ethereum's releases</a>.</em></p>
<blockquote>
<h2>Vallhallan Threshold (v1.10.12)</h2>
<p>Geth v1.10.12 is a scheduled maintenance release, but also contains some significant features!</p>
<p><strong>The release enables the <a href="https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/arrow-glacier.md">Arrow Glacier hard-fork</a>, scheduled approximately for the 8th of December. The sole change is to <a href="https://eips.ethereum.org/EIPS/eip-4345">postpone the difficulty-bomb</a> until summer 2022, by which time hopefully The Merge will have happened.</strong></p>
<p>The release also ships support for a new PoW testnet called <em>Sepolia</em>. This testnet was dreamed up during the merge interop in Athens and it's purpose is to replace Ropsten after the merge as the main cross client testnet. You can access it via <code>geth --sepolia</code>. Being a PoW testnet, it's possible to mine it for Ether to use as test funds.</p>
<p>Lastly, the release also contains a brand new call tracer implemented in Go, which should be significantly (<strong>2.5x</strong>) faster than the one currently used. You can use the new tracer via <code>debug.traceTransaction(&quot;0xhash&quot;, {tracer: &quot;callTracer&quot;})</code>. The original JavaScript tracer is still available for fallback purposes called <code>callTracerLegacy</code>. The latter will be dropped if nobody reports issues with the native one.</p>
<p>Improvements:</p>
<ul>
<li>Implement the Arrow Glacier hard fork and schedule (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23810">#23810</a>).</li>
<li>Bake in support for the Sepolia PoW test network (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23730">#23730</a>).</li>
<li>Switch the call tracer to a fast native Go implementation (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23867">#23867</a>, <a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23708">#23708</a>).</li>
<li>Optimize nonce handling performance in the txpool (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/22231">#22231</a>).</li>
<li>Support password protected SSH key files in <code>puppeth</code> (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/22148">#22148</a>).</li>
<li>Optimize request/response matching in RPC batch queries (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23856">#23856</a>).</li>
<li>Support transferring snapshots via <code>geth db export snapshot</code> (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/22931">#22931</a>).</li>
<li>Read chain data atomically from ancients/leveldb, avoiding an extra read (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23566">#23566</a>).</li>
<li>Improve the <code>hexutil</code> package's big-int encoding performance by 50% (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23780">#23780</a>)</li>
<li>Remove the <code>xgo</code> cross compiler as docker auto-build limits killed it (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23800">#23800</a>).</li>
<li>Support invalid RLP blobs (at least fail gracefully) in the state <code>t8n</code> tool (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23771">#23771</a>).</li>
</ul>
<p>Bug-fixes:</p>
<ul>
<li>Fix a crash in LES serving code (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23865">#23865</a>).</li>
<li>Fix a data race in the miner's receipt copying code (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23835">#23835</a>).</li>
<li>Fix a missing snapshot error after recovering from a crash (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23496">#23496</a>).</li>
<li>Fix a memory leak in Clique if the network temporarilly halts (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23861">#23861</a>).</li>
<li>Fix a crash if the disk gets full during ethash DAG generation (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23799">#23799</a>).</li>
<li>Fix chain tracing to not go OOM during long running sessions (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23736">#23736</a>).</li>
<li>Fix the simulated backend to allow running EIP-1559 transactions (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23838">#23838</a>, <a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23840">#23840</a>).</li>
<li>Fix an RPC crash when getting the signer of an empty Clique chain (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23832">#23832</a>).</li>
<li>Fix the total difficulty number of nil-diff genesis blocks in the database (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23793">#23793</a>).</li>
<li>Fix a crash in <code>abigen</code> generated code if backend header retrieval fails (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/pull/23781">#23781</a>).</li>
</ul>
<p>For a full rundown of the changes please consult the Geth 1.10.12 <a href="https://github.com/ethereum/go-ethereum/milestone/124?closed=1">release milestone</a>.</p>
<hr />
<p>As with all our previous releases, you can find the:</p>
<ul>
<li>Pre-built binaries for all platforms on our <a href="https://geth.ethereum.org/downloads/">downloads page</a>.</li>
<li>Docker images published under <a href="https://cloud.docker.com/u/ethereum/repository/docker/ethereum/client-go"><code>ethereum/client-go</code></a>.</li>
<li>Ubuntu packages in our <a href="https://launchpad.net/~ethereum/+archive/ubuntu/ethereum">Launchpad PPA repository</a>.</li>
<li>OSX packages in our <a href="https://github.com/ethereum/homebrew-ethereum">Homebrew Tap repository</a>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/ethereum/go-ethereum/commit/6c4dc6c38827296dec5a49a6ea25fd7f0eb4ac77"><code>6c4dc6c</code></a> params: release Geth v1.10.12</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/787a3b185c2205c0bf3dfaa7a9e986dd3393e199"><code>787a3b1</code></a> eth/tracers: make native calltracer default (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23867">#23867</a>)</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/851256e85640e9449501ff7fc2a79b2f8aefecc1"><code>851256e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23869">#23869</a> from karalabe/cht-1.10.12-ropsten</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/c4fff0f56e023ef4c056a9f253d161676b9d90b5"><code>c4fff0f</code></a> params: update Ropsten CHT too</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/aa2727f82c79e4493b96b9e680bb6073a6cc95d2"><code>aa2727f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23868">#23868</a> from karalabe/cht-1.10.12</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/e61b8cb1f8c33262039b1c982302b53adcd4b6d9"><code>e61b8cb</code></a> params: update CHTs for the 1.10.12 release</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/e1c000b0ddb7406b4081588f59cac745a896c983"><code>e1c000b</code></a> cmd/geth: add support for sepolia testnet (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23730">#23730</a>)</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/8be8ba450e3efda51b19389320f2b229545074cf"><code>8be8ba4</code></a> les/vflux: fixed panic and data races (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23865">#23865</a>)</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/476fb565cecb483f7506f4dceb438d506464194d"><code>476fb56</code></a> miner, consensus/clique: avoid memory leak during block stasis (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23861">#23861</a>)</li>
<li><a href="https://github.com/ethereum/go-ethereum/commit/8d7e6062ece1550936065aa8a8f8c7aacc584810"><code>8d7e606</code></a> eth/tracers: support for golang tracers + add golang callTracer (<a href="https://github-redirect.dependabot.com/ethereum/go-ethereum/issues/23708">#23708</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/ethereum/go-ethereum/compare/v1.10.11...v1.10.12">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/ethereum/go-ethereum&package-manager=go_modules&previous-version=1.10.11&new-version=1.10.12)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>
* initial commit

* updates

* updates

* fix lint

* update readme

* fix

* fix lint

* updates

* updates

* lint

* Update README.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update README.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* update

* update

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
…(#44)

Bumps [github.com/umee-network/umee](https://github.com/umee-network/umee) from 0.4.0-rc2 to 0.4.0-rc3.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/umee-network/umee/commit/9547ff1832199d5468ab78c22a3da278669722f8"><code>9547ff1</code></a> chore: bump IBC to v2.0.0 (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/217">#217</a>) (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/219">#219</a>)</li>
<li><a href="https://github.com/umee-network/umee/commit/5a9e4ccee77f469751c0be6599c63c18ad828293"><code>5a9e4cc</code></a> chore: update e2e tests (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/215">#215</a>) (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/216">#216</a>)</li>
<li><a href="https://github.com/umee-network/umee/commit/ec3e1764d552d11123456fee258508af088ab284"><code>ec3e176</code></a> feat: add peggy to e2e test suite (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/203">#203</a>) (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/214">#214</a>)</li>
<li><a href="https://github.com/umee-network/umee/commit/9c3e75f52b654a49118c906e7d59799bb9339b43"><code>9c3e75f</code></a> build(deps): Bump github.com/ethereum/go-ethereum (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/211">#211</a>) (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/212">#212</a>)</li>
<li><a href="https://github.com/umee-network/umee/commit/2259c157443f96f7b54fdf061a0639939d7f7362"><code>2259c15</code></a> feat: x/peggy ERC20 mapping CLI queries (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/201">#201</a>) (<a href="https://github-redirect.dependabot.com/umee-network/umee/issues/202">#202</a>)</li>
<li>See full diff in <a href="https://github.com/umee-network/umee/compare/v0.4.0-rc2...v0.4.0-rc3">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/umee-network/umee&package-manager=go_modules&previous-version=0.4.0-rc2&new-version=0.4.0-rc3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>
cosmostypes "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/pkg/errors"
umeeapp "github.com/umee-network/umee/app"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to myself: depend on celestia-app here to build client context.

"github.com/InjectiveLabs/sdk-go/chain/peggy/types"
"github.com/umee-network/peggo/cmd/peggo/client"
"github.com/umee-network/peggo/orchestrator/cosmos"
peggytypes "github.com/umee-network/umee/x/peggy/types"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: I think we need a module in celestia-app for the query types and maybe other bridge related logic. (cc @evan-forbes)

.github/CODEOWNERS Outdated Show resolved Hide resolved
.github/dependabot.yml Outdated Show resolved Hide resolved
liamsi and others added 2 commits November 14, 2021 11:27
Co-authored-by: John Adler <adlerjohn@users.noreply.github.com>
Co-authored-by: John Adler <adlerjohn@users.noreply.github.com>
@liamsi liamsi merged commit 5853134 into master Nov 15, 2021
@liamsi liamsi deleted the ismail/merge-in_umee_peggo branch November 15, 2021 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants