Skip to content

Commit

Permalink
Merge pull request #3450 from jorgemmsilva/fix/l1-nft-misc
Browse files Browse the repository at this point in the history
improvement: update EVM, ERC721NFTs UX improvements
  • Loading branch information
jorgemmsilva authored Jul 2, 2024
2 parents a927f1d + 30ee802 commit fa34b49
Show file tree
Hide file tree
Showing 81 changed files with 802 additions and 654 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- name: install golang
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"

- name: install rust-toolchain
uses: actions-rs/[email protected]
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
id: go

- name: Check out code into the Go module directory
Expand All @@ -97,14 +97,14 @@ jobs:
- name: Run global scope golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.54.2
version: v1.56.1
args: --timeout 15m0s
skip-pkg-cache: true
skip-cache: true

- name: Run golangci-lint on wasp-cli
uses: golangci/golangci-lint-action@v6
with:
working-directory: tools/wasp-cli
version: v1.54.2
version: v1.56.1
args: --timeout 15m0s
skip-pkg-cache: true
skip-cache: true
6 changes: 6 additions & 0 deletions contracts/wasm/corecontracts/test/core_accounts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ func TestAccountNFTAmountInCollection(t *testing.T) {
"text/html",
"https://my-awesome-nft-project.com",
"a string that is longer than 32 bytes",
`[{"trait_type": "collection", "value": "super"}]`,
)

collection, collectionInfo, err := ctx.Chain.Env.MintNFTL1(collectionOwner, collectionOwnerAddr, collectionMetadata.Bytes())
Expand All @@ -317,11 +318,13 @@ func TestAccountNFTAmountInCollection(t *testing.T) {
"application/json",
"https://my-awesome-nft-project.com/1.json",
"nft1",
`[{"trait_type": "Foo", "value": "Bar"}]`,
),
isc.NewIRC27NFTMetadata(
"application/json",
"https://my-awesome-nft-project.com/2.json",
"nft2",
`[{"trait_type": "Bar", "value": "Baz"}]`,
),
}
nftNum := len(nftMetadatas)
Expand Down Expand Up @@ -377,6 +380,7 @@ func TestAccountNFTsInCollection(t *testing.T) {
"text/html",
"https://my-awesome-nft-project.com",
"a string that is longer than 32 bytes",
`[{"trait_type": "collection", "value": "super"}]`,
)

collection, collectionInfo, err := ctx.Chain.Env.MintNFTL1(collectionOwner, collectionOwnerAddr, collectionMetadata.Bytes())
Expand All @@ -387,11 +391,13 @@ func TestAccountNFTsInCollection(t *testing.T) {
"application/json",
"https://my-awesome-nft-project.com/1.json",
"nft1",
`[{"trait_type": "Foo", "value": "Bar"}]`,
),
isc.NewIRC27NFTMetadata(
"application/json",
"https://my-awesome-nft-project.com/2.json",
"nft2",
`[{"trait_type": "Bar", "value": "Baz"}]`,
),
}
nftNum := len(nftMetadatas)
Expand Down
1 change: 0 additions & 1 deletion contracts/wasm/testwasmlib/test/deploy.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ wasp-cli chain deploy-contract wasmtime testwasmlib "Test WasmLib" ..\rs\testwas
wasp-cli chain post-request -s testwasmlib random
wasp-cli chain call-view testwasmlib getRandom | wasp-cli decode string random uint64
wasp-cli chain balance
wasp-cli chain list-accounts
wasp-cli check-versions
1 change: 0 additions & 1 deletion contracts/wasm/testwasmlib/test/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ wasp-cli chain deploy-contract wasmtime testwasmlib "Test WasmLib" ../rs/testwas
wasp-cli chain post-request -s testwasmlib random
wasp-cli chain call-view testwasmlib getRandom | wasp-cli decode string random uint64
wasp-cli chain balance
wasp-cli chain list-accounts
wasp-cli check-versions
19 changes: 9 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/iotaledger/wasp
go 1.21

replace (
github.com/ethereum/go-ethereum => github.com/iotaledger/go-ethereum v1.13.12-wasp1
github.com/ethereum/go-ethereum => github.com/iotaledger/go-ethereum v1.14.5-wasp1
go.dedis.ch/kyber/v3 => github.com/kape1395/kyber/v3 v3.0.14-0.20230124095845-ec682ff08c93 // branch: dkg-2suites
)

Expand Down Expand Up @@ -69,39 +69,39 @@ require (
require (
filippo.io/edwards25519 v1.0.0 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/errors v1.11.0 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/deckarep/golang-set/v2 v2.3.1 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/felixge/fgprof v0.9.3 // indirect
github.com/flynn/noise v1.0.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
github.com/getsentry/sentry-go v0.23.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
Expand All @@ -111,7 +111,6 @@ require (
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/go-github v17.0.0+incompatible // indirect
github.com/google/go-querystring v1.1.0 // indirect
Expand Down
Loading

0 comments on commit fa34b49

Please sign in to comment.