mod:update chain33 & avalanche dependency

33cn · May 26, 2024 · 9b7d710 · 9b7d710
1 parent 3c67738
commit 9b7d710
Show file tree

Hide file tree

Showing 50 changed files with 94 additions and 48 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.8
 // +build go1.8
 
 package main

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/33cn/plugin
 
 go 1.19
 
-replace github.com/33cn/chain33 => github.com/bysomeone/chain33 v0.0.0-20240512025003-55d7dc44896a
+replace github.com/33cn/chain33 => github.com/bysomeone/chain33 v0.0.0-20240526154333-c9b4079f37f6
 
 require (
 	github.com/33cn/chain33 v0.0.0-00010101000000-000000000000
@@ -268,7 +268,7 @@ require (
 )
 
 replace (
-	github.com/ava-labs/avalanchego => github.com/bysomeone/avalanchego v0.0.0-20240511070301-a9a2aac50464
+	github.com/ava-labs/avalanchego => github.com/bysomeone/avalanchego v0.0.0-20240525154058-c4ea5da7ec71
 	github.com/btcsuite/btcd/btcec => github.com/btcsuite/btcd v0.22.3
 	github.com/consensys/gnark-crypto => github.com/consensys/gnark-crypto v0.5.3
 )
diff --git a/go.sum b/go.sum
@@ -231,10 +231,10 @@ github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtE
 github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/bysomeone/avalanchego v0.0.0-20240511070301-a9a2aac50464 h1:fjGGreFQgEMo+jTduHpxVpDOVbGd45Wata/KXu9ieWg=
-github.com/bysomeone/avalanchego v0.0.0-20240511070301-a9a2aac50464/go.mod h1:SgoXVssKD3a3diOV4qaTkOEQ+2KEfErcdOASIhV6a1s=
-github.com/bysomeone/chain33 v0.0.0-20240512025003-55d7dc44896a h1:ZnYbRkAmbf95wyyt11j1FcQfm5ClzHX+qOhxUkfJ4Rk=
-github.com/bysomeone/chain33 v0.0.0-20240512025003-55d7dc44896a/go.mod h1:NEpm22MBaVvBlXMxokvnecNf4hfE9VWG/6LdEYP4zvw=
+github.com/bysomeone/avalanchego v0.0.0-20240525154058-c4ea5da7ec71 h1:y70tfpRGONtMp0EqL+uYMTdaTR4OBpC631a97b0dTa4=
+github.com/bysomeone/avalanchego v0.0.0-20240525154058-c4ea5da7ec71/go.mod h1:SgoXVssKD3a3diOV4qaTkOEQ+2KEfErcdOASIhV6a1s=
+github.com/bysomeone/chain33 v0.0.0-20240526154333-c9b4079f37f6 h1:fpWxDK9ic/CaRp3RcnXCKHPQl7CAyc7ph6CwJSqXnsE=
+github.com/bysomeone/chain33 v0.0.0-20240526154333-c9b4079f37f6/go.mod h1:BwuBoRogoSU1GouVhnFCtLIOGcRALtLaq7ThEu/FsKE=
 github.com/c-bata/go-prompt v0.2.2 h1:uyKRz6Z6DUyj49QVijyM339UJV9yhbr70gESwbNU3e0=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=

diff --git a/plugin/consensus/ticket/ticket.go b/plugin/consensus/ticket/ticket.go
@@ -10,14 +10,15 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/33cn/chain33/common/address"
-	"github.com/33cn/chain33/system/address/eth"
 	"math/big"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/33cn/chain33/common/address"
+	"github.com/33cn/chain33/system/address/eth"
+
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/crypto"
 	"github.com/33cn/chain33/common/difficulty"

diff --git a/plugin/crypto/bls/bls.go b/plugin/crypto/bls/bls.go
@@ -9,6 +9,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
+
 	"github.com/33cn/chain33/common"
 
 	"github.com/33cn/chain33/common/crypto"

diff --git a/plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go b/plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethereum.go
@@ -14,7 +14,6 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/core/txpool"
 	"math"
 	"math/big"
 	"regexp"
@@ -23,6 +22,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core/txpool"
+
 	chain33Common "github.com/33cn/chain33/common"
 	dbm "github.com/33cn/chain33/common/db"
 	log "github.com/33cn/chain33/common/log/log15"

diff --git a/plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethtxs/relayToEthereum.go b/plugin/dapp/cross2eth/ebrelayer/relayer/ethereum/ethtxs/relayToEthereum.go
@@ -2,10 +2,11 @@ package ethtxs
 
 import (
 	"crypto/ecdsa"
-	"github.com/ethereum/go-ethereum/core/txpool"
 	"math/big"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core/txpool"
+
 	chain33Common "github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/common/log/log15"
 	"github.com/33cn/plugin/plugin/dapp/cross2eth/contracts/contracts4eth/generated"

diff --git a/plugin/dapp/cross2eth/ebrelayer/types/config.pb.go b/plugin/dapp/cross2eth/ebrelayer/types/config.pb.go
diff --git a/plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go b/plugin/dapp/cross2eth/ebrelayer/types/relayer.pb.go
diff --git a/plugin/dapp/evm/executor/evm.go b/plugin/dapp/evm/executor/evm.go
@@ -7,11 +7,12 @@ package executor
 import (
 	"bytes"
 	"fmt"
-	log "github.com/33cn/chain33/common/log/log15"
 	"math/big"
 	"os"
 	"reflect"
 
+	log "github.com/33cn/chain33/common/log/log15"
+
 	"github.com/33cn/chain33/common/address"
 	drivers "github.com/33cn/chain33/system/dapp"
 	"github.com/33cn/chain33/types"

diff --git a/plugin/dapp/evm/executor/exec.go b/plugin/dapp/evm/executor/exec.go
@@ -8,11 +8,12 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/33cn/chain33/system/crypto/secp256k1eth"
 	"math"
 	"strings"
 	"sync/atomic"
 
+	"github.com/33cn/chain33/system/crypto/secp256k1eth"
+
 	"github.com/33cn/chain33/common/address"
 
 	"github.com/33cn/chain33/account"

diff --git a/plugin/dapp/evm/executor/exec_local.go b/plugin/dapp/evm/executor/exec_local.go
@@ -7,6 +7,7 @@ package executor
 import (
 	"bytes"
 	"errors"
+
 	"github.com/33cn/chain33/common"
 	"github.com/33cn/chain33/system/crypto/secp256k1eth"
 	"github.com/33cn/chain33/types"

diff --git a/plugin/dapp/evm/executor/query.go b/plugin/dapp/evm/executor/query.go
@@ -8,12 +8,13 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/33cn/chain33/common/address"
-	"github.com/33cn/chain33/system/address/eth"
 	"math/big"
 	"strings"
 	"sync/atomic"
 
+	"github.com/33cn/chain33/common/address"
+	"github.com/33cn/chain33/system/address/eth"
+
 	"github.com/33cn/chain33/executor"
 
 	"github.com/33cn/chain33/common"

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2bAVX2_amd64.go b/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2bAVX2_amd64.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.7 && amd64 && !gccgo && !appengine
 // +build go1.7,amd64,!gccgo,!appengine
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_amd64.go b/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_amd64.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !go1.7 && amd64 && !gccgo && !appengine
 // +build !go1.7,amd64,!gccgo,!appengine
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_f_fuzz.go b/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_f_fuzz.go
@@ -1,3 +1,4 @@
+//go:build gofuzz
 // +build gofuzz
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_ref.go b/plugin/dapp/evm/executor/vm/common/crypto/blake2b/blake2b_ref.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !amd64 || appengine || gccgo
 // +build !amd64 appengine gccgo
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/blake2b/register.go b/plugin/dapp/evm/executor/vm/common/crypto/blake2b/register.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.9
 // +build go1.9
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_decl.go b/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_decl.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build (amd64 && blsasm) || (amd64 && blsadx)
 // +build amd64,blsasm amd64,blsadx
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_fallback.go b/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_fallback.go
diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_x86_adx.go b/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_x86_adx.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build amd64 && blsadx
 // +build amd64,blsadx
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_x86_noadx.go b/plugin/dapp/evm/executor/vm/common/crypto/bls12381/arithmetic_x86_noadx.go
@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build amd64 && blsasm
 // +build amd64,blsasm
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_fast.go b/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_fast.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found
 // in the LICENSE file.
 
+//go:build amd64 || arm64
 // +build amd64 arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_fuzz.go b/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_fuzz.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found
 // in the LICENSE file.
 
+//go:build gofuzz
 // +build gofuzz
 
 package bn256 //nolint

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_slow.go b/plugin/dapp/evm/executor/vm/common/crypto/bn256/bn256_slow.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found
 // in the LICENSE file.
 
+//go:build !amd64 && !arm64
 // +build !amd64,!arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bn256/cloudflare/gfp_decl.go b/plugin/dapp/evm/executor/vm/common/crypto/bn256/cloudflare/gfp_decl.go
@@ -1,3 +1,4 @@
+//go:build (amd64 && !generic) || (arm64 && !generic)
 // +build amd64,!generic arm64,!generic
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/common/crypto/bn256/cloudflare/gfp_generic.go b/plugin/dapp/evm/executor/vm/common/crypto/bn256/cloudflare/gfp_generic.go
@@ -1,3 +1,4 @@
+//go:build (!amd64 && !arm64) || generic
 // +build !amd64,!arm64 generic
 
 //nolint:unparam // 忽视本文件所有golangci-linter检查

diff --git a/plugin/dapp/evm/executor/vm/state/check.go b/plugin/dapp/evm/executor/vm/state/check.go
@@ -2,8 +2,9 @@ package state
 
 import (
 	"errors"
+
+	"github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common"
 )
-import "github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common"
 
 // TxData 本文件用来存储硬分叉中需要用到的数据
 type EvmTxData struct {

diff --git a/plugin/dapp/evm/types/evmcontract.pb.go b/plugin/dapp/evm/types/evmcontract.pb.go
diff --git a/plugin/dapp/evmxgo/types/evmxgo.pb.go b/plugin/dapp/evmxgo/types/evmxgo.pb.go
diff --git a/plugin/dapp/exchange/types/exchange.pb.go b/plugin/dapp/exchange/types/exchange.pb.go
diff --git a/plugin/dapp/mix/types/cryptokey.pb.go b/plugin/dapp/mix/types/cryptokey.pb.go
diff --git a/plugin/dapp/mix/types/merkletree.pb.go b/plugin/dapp/mix/types/merkletree.pb.go
diff --git a/plugin/dapp/mix/types/mix.pb.go b/plugin/dapp/mix/types/mix.pb.go
diff --git a/plugin/dapp/mix/types/mixwallet.pb.go b/plugin/dapp/mix/types/mixwallet.pb.go
diff --git a/plugin/dapp/multisig/executor/action.go b/plugin/dapp/multisig/executor/action.go
@@ -6,6 +6,7 @@ package executor
 
 import (
 	"encoding/hex"
+
 	"github.com/33cn/plugin/plugin/dapp/common"
 
 	"github.com/33cn/chain33/system/address/btc"