Skip to content
This repository has been archived by the owner on Jun 9, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into benching
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsdevbear
itsdevbear authored Nov 22, 2023
2 parents f7aad2f + ee59d43 commit 57eb805
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 213 deletions.
6 changes: 3 additions & 3 deletions cosmos/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ require (
cosmossdk.io/store v1.0.0
cosmossdk.io/x/evidence v0.0.0-20231103111158-e83a20081ced
cosmossdk.io/x/tx v0.12.0
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/contracts v0.0.1-alpha
github.com/berachain/polaris/eth v0.0.1-alpha
github.com/berachain/polaris/lib v0.0.1-alpha
github.com/btcsuite/btcd v0.23.2
github.com/btcsuite/btcd/btcutil v1.1.3
github.com/cometbft/cometbft v0.38.0
Expand Down
12 changes: 6 additions & 6 deletions cosmos/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU=
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 h1:cs9ne0fJIUUxHWmF7nC02GMTavviaD/JqEkfVIcS/js=
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/berachain/polaris/contracts v0.0.1-alpha h1:nhmAB8Zz2wUkei2WHisbOwFXu8xokmDy3is/VuZ+dSw=
github.com/berachain/polaris/contracts v0.0.1-alpha/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/eth v0.0.1-alpha h1:+uA1EGaSNGB5C2qQn6Dqzp3uCgI1EE2O5B/IdKr3BNU=
github.com/berachain/polaris/eth v0.0.1-alpha/go.mod h1:od/ALWEMzfR+Wj0fI2DE4de4f/Ee4CFXWu/ZkMxKy6A=
github.com/berachain/polaris/lib v0.0.1-alpha h1:d6Dl7yN/5I4j06SdY4bXHvTNzkmktc3tgtIDkZP9ORw=
github.com/berachain/polaris/lib v0.0.1-alpha/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
Expand Down
3 changes: 2 additions & 1 deletion cosmos/runtime/txpool/mempool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ func (m *Mempool) Insert(ctx context.Context, sdkTx sdk.Tx) error {
}

if wet, ok := utils.GetAs[*types.WrappedEthereumTransaction](msgs[0]); !ok {
return errors.New("only WrappedEthereumTransactions are supported")
// We have to return nil for non-ethereum transactions as to not fail check-tx.
return nil
} else if errs := m.txpool.Add(
[]*coretypes.Transaction{wet.Unwrap()}, false, false,
); len(errs) != 0 {
Expand Down
4 changes: 2 additions & 2 deletions cosmos/runtime/txpool/mempool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ var _ = Describe("", func() {
})
})
When("we use an that is not an ethereum msg", func() {
It("errors", func() {
It("does not error", func() {
sdkTx.On("GetMsgs").Return([]sdk.Msg{nil}).Once()
Expect(mempool.Insert(ctx, sdkTx)).To(HaveOccurred())
Expect(mempool.Insert(ctx, sdkTx)).ToNot(HaveOccurred())
})
})
})
Expand Down
4 changes: 2 additions & 2 deletions e2e/localnet/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/berachain/polaris/e2e/localnet
go 1.21

require (
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/contracts v0.0.1-alpha
github.com/berachain/polaris/eth v0.0.1-alpha
github.com/docker/docker v24.0.7+incompatible
github.com/ethereum/go-ethereum v1.13.4
github.com/onsi/ginkgo/v2 v2.13.0
Expand Down
8 changes: 4 additions & 4 deletions e2e/localnet/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bw
github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU=
github.com/berachain/polaris/contracts v0.0.1-alpha h1:nhmAB8Zz2wUkei2WHisbOwFXu8xokmDy3is/VuZ+dSw=
github.com/berachain/polaris/contracts v0.0.1-alpha/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/eth v0.0.1-alpha h1:+uA1EGaSNGB5C2qQn6Dqzp3uCgI1EE2O5B/IdKr3BNU=
github.com/berachain/polaris/eth v0.0.1-alpha/go.mod h1:od/ALWEMzfR+Wj0fI2DE4de4f/Ee4CFXWu/ZkMxKy6A=
github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k=
github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
Expand Down
4 changes: 2 additions & 2 deletions e2e/precompile/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/berachain/polaris/e2e/precompile
go 1.21

require (
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/contracts v0.0.1-alpha
github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/eth v0.0.1-alpha
github.com/cosmos/cosmos-sdk v0.50.1
github.com/cosmos/gogoproto v1.4.11
github.com/onsi/ginkgo/v2 v2.13.0
Expand Down
8 changes: 4 additions & 4 deletions e2e/precompile/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/contracts v0.0.1-alpha h1:nhmAB8Zz2wUkei2WHisbOwFXu8xokmDy3is/VuZ+dSw=
github.com/berachain/polaris/contracts v0.0.1-alpha/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6 h1:xQ8G7u5kA2aCaL8gsBI2S30Ww5V6WmpYX/7Da9tyPBU=
github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:5kTiiw+chO6yj5JZQsWK2qNZtbxYaG0t78uSOJZJ2PE=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU=
github.com/berachain/polaris/eth v0.0.1-alpha h1:+uA1EGaSNGB5C2qQn6Dqzp3uCgI1EE2O5B/IdKr3BNU=
github.com/berachain/polaris/eth v0.0.1-alpha/go.mod h1:od/ALWEMzfR+Wj0fI2DE4de4f/Ee4CFXWu/ZkMxKy6A=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
Expand Down
8 changes: 4 additions & 4 deletions e2e/testapp/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ require (
cosmossdk.io/x/evidence v0.0.0-20231103111158-e83a20081ced
cosmossdk.io/x/tx v0.12.0 // indirect
cosmossdk.io/x/upgrade v0.0.0-20231103111158-e83a20081ced
github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/cosmos v0.0.1-alpha
github.com/berachain/polaris/eth v0.0.1-alpha
github.com/cometbft/cometbft v0.38.0
github.com/cosmos/cosmos-db v1.0.0
github.com/cosmos/cosmos-sdk v0.50.1
Expand All @@ -55,8 +55,8 @@ require (
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/aws/aws-sdk-go v1.44.224 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567 // indirect
github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567 // indirect
github.com/berachain/polaris/contracts v0.0.1-alpha // indirect
github.com/berachain/polaris/lib v0.0.1-alpha // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
github.com/bits-and-blooms/bitset v1.11.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions e2e/testapp/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,14 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q=
github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567 h1:RnfGz1Zb1FYJx3iRZVDDU3XAx+JrOoaRdDkv8CIlZzY=
github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6 h1:92D3+rbXAcsQHx9SKYFs+oz+d1d/y6Qku4k0fb09ajc=
github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:0r/gooN/eZyGyIgiUHQo4ccfw0+RR30TWoseKlNcLuQ=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI=
github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU=
github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567 h1:bW3CAESDF1I1apPhzOQr1secXf4ZwSRQ4XTwA0LO/xk=
github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/berachain/polaris/contracts v0.0.1-alpha h1:nhmAB8Zz2wUkei2WHisbOwFXu8xokmDy3is/VuZ+dSw=
github.com/berachain/polaris/contracts v0.0.1-alpha/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/cosmos v0.0.1-alpha h1:1jN3K6bJHVbBvIZlXRW7h48ZBkatC+KgTXnzRVCzdMk=
github.com/berachain/polaris/cosmos v0.0.1-alpha/go.mod h1:FVuqTI+v+av77phVhEoPJ8pZi5Dyq7bSBmQZwKQnbGU=
github.com/berachain/polaris/eth v0.0.1-alpha h1:+uA1EGaSNGB5C2qQn6Dqzp3uCgI1EE2O5B/IdKr3BNU=
github.com/berachain/polaris/eth v0.0.1-alpha/go.mod h1:od/ALWEMzfR+Wj0fI2DE4de4f/Ee4CFXWu/ZkMxKy6A=
github.com/berachain/polaris/lib v0.0.1-alpha h1:d6Dl7yN/5I4j06SdY4bXHvTNzkmktc3tgtIDkZP9ORw=
github.com/berachain/polaris/lib v0.0.1-alpha/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
Expand Down
4 changes: 2 additions & 2 deletions eth/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ replace (
)

require (
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6
github.com/berachain/polaris/contracts v0.0.1-alpha
github.com/berachain/polaris/lib v0.0.1-alpha
github.com/ethereum/go-ethereum v1.13.4
github.com/holiman/uint256 v1.2.3
github.com/onsi/ginkgo/v2 v2.13.0
Expand Down
8 changes: 4 additions & 4 deletions eth/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc=
github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4=
github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 h1:cs9ne0fJIUUxHWmF7nC02GMTavviaD/JqEkfVIcS/js=
github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/berachain/polaris/contracts v0.0.1-alpha h1:nhmAB8Zz2wUkei2WHisbOwFXu8xokmDy3is/VuZ+dSw=
github.com/berachain/polaris/contracts v0.0.1-alpha/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4=
github.com/berachain/polaris/lib v0.0.1-alpha h1:d6Dl7yN/5I4j06SdY4bXHvTNzkmktc3tgtIDkZP9ORw=
github.com/berachain/polaris/lib v0.0.1-alpha/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk=
github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k=
github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
Expand Down
Loading

0 comments on commit 57eb805

Please sign in to comment.