Skip to content

Commit f825944

Browse files
committed
update emulator and fix tests
1 parent 0476108 commit f825944

File tree

5 files changed

+381
-454
lines changed

5 files changed

+381
-454
lines changed

lib/go/templates/transaction_templates.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,37 @@ func GenerateTransferGenericVaultWithAddressScript(fungibleTokenAddr, ftMetadata
9898
ftMetadataViewsImport+withHexPrefix(ftMetadataViewsAddr),
9999
)
100100

101+
code = strings.ReplaceAll(
102+
code,
103+
placeholderMetadataViews,
104+
metadataViewsImport+withHexPrefix(ftMetadataViewsAddr),
105+
)
106+
107+
return []byte(code)
108+
}
109+
110+
func TESTGenerateTransferGenericVaultWithAddressScript(fungibleTokenAddr, ftMetadataViewsAddr, metadataViewsAddr string) []byte {
111+
112+
code := assets.MustAssetString(genericTransferWithAddressFilename)
113+
114+
code = strings.ReplaceAll(
115+
code,
116+
placeholderFungibleToken,
117+
fungibleTokenImport+withHexPrefix(fungibleTokenAddr),
118+
)
119+
120+
code = strings.ReplaceAll(
121+
code,
122+
placeholderFTMetadataViews,
123+
ftMetadataViewsImport+withHexPrefix(ftMetadataViewsAddr),
124+
)
125+
126+
code = strings.ReplaceAll(
127+
code,
128+
placeholderMetadataViews,
129+
metadataViewsImport+withHexPrefix(metadataViewsAddr),
130+
)
131+
101132
return []byte(code)
102133
}
103134

lib/go/test/go.mod

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,43 @@
11
module github.com/onflow/flow-ft/lib/go/test
22

3-
go 1.23.7
4-
5-
toolchain go1.24.1
3+
go 1.25.0
64

75
require (
86
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
9-
github.com/onflow/cadence v1.6.2
10-
github.com/onflow/flow-emulator v1.5.1
7+
github.com/onflow/cadence v1.7.1
8+
github.com/onflow/flow-emulator v1.8.0
119
github.com/onflow/flow-ft/lib/go/contracts v1.0.1
1210
github.com/onflow/flow-ft/lib/go/templates v1.0.1
13-
github.com/onflow/flow-go-sdk v1.6.1
14-
github.com/onflow/flow-nft/lib/go/contracts v1.2.4
15-
github.com/rs/zerolog v1.29.0
16-
github.com/stretchr/testify v1.10.0
11+
github.com/onflow/flow-go-sdk v1.8.4
12+
github.com/onflow/flow-nft/lib/go/contracts v1.3.0
13+
github.com/rs/zerolog v1.34.0
14+
github.com/stretchr/testify v1.11.1
1715
)
1816

1917
require (
20-
github.com/DataDog/zstd v1.5.2 // indirect
18+
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
2119
github.com/Microsoft/go-winio v0.6.2 // indirect
2220
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
2321
github.com/StackExchange/wmi v1.2.1 // indirect
2422
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
2523
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/bits-and-blooms/bitset v1.17.0 // indirect
24+
github.com/bits-and-blooms/bitset v1.24.0 // indirect
2725
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
2826
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2927
github.com/cespare/xxhash v1.1.0 // indirect
3028
github.com/cespare/xxhash/v2 v2.3.0 // indirect
29+
github.com/cockroachdb/crlib v0.0.0-20241015224233-894974b3ad94 // indirect
3130
github.com/cockroachdb/errors v1.11.3 // indirect
3231
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
3332
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
34-
github.com/cockroachdb/pebble v1.1.2 // indirect
33+
github.com/cockroachdb/pebble/v2 v2.0.6 // indirect
3534
github.com/cockroachdb/redact v1.1.5 // indirect
35+
github.com/cockroachdb/swiss v0.0.0-20250624142022-d6e517c1d961 // indirect
3636
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
37-
github.com/consensys/bavard v0.1.22 // indirect
38-
github.com/consensys/gnark-crypto v0.14.0 // indirect
37+
github.com/consensys/gnark-crypto v0.18.0 // indirect
3938
github.com/coreos/go-semver v0.3.0 // indirect
39+
github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect
4040
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
41-
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
4241
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4342
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
4443
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
@@ -49,34 +48,34 @@ require (
4948
github.com/docker/go-units v0.5.0 // indirect
5049
github.com/dustin/go-humanize v1.0.1 // indirect
5150
github.com/ef-ds/deque v1.0.4 // indirect
52-
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
53-
github.com/ethereum/go-ethereum v1.13.10 // indirect
51+
github.com/emicklei/dot v1.6.2 // indirect
52+
github.com/ethereum/c-kzg-4844/v2 v2.1.0 // indirect
53+
github.com/ethereum/go-ethereum v1.16.3 // indirect
5454
github.com/ethereum/go-verkle v0.2.2 // indirect
55+
github.com/ferranbt/fastssz v0.1.4 // indirect
5556
github.com/fsnotify/fsnotify v1.6.0 // indirect
5657
github.com/fxamacker/cbor/v2 v2.8.1-0.20250402194037-6f932b086829 // indirect
5758
github.com/fxamacker/circlehash v0.3.0 // indirect
58-
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
59+
github.com/fxamacker/golang-lru/v2 v2.0.0-20250716153046-22c8d17dc4ee // indirect
5960
github.com/getsentry/sentry-go v0.27.0 // indirect
6061
github.com/glebarez/go-sqlite v1.22.0 // indirect
6162
github.com/go-kit/kit v0.12.0 // indirect
6263
github.com/go-kit/log v0.2.1 // indirect
6364
github.com/go-logfmt/logfmt v0.6.0 // indirect
64-
github.com/go-logr/logr v1.4.2 // indirect
65+
github.com/go-logr/logr v1.4.3 // indirect
6566
github.com/go-logr/stdr v1.2.2 // indirect
6667
github.com/go-ole/go-ole v1.3.0 // indirect
6768
github.com/go-redis/redis/v8 v8.11.5 // indirect
68-
github.com/gofrs/flock v0.8.1 // indirect
69+
github.com/gofrs/flock v0.12.1 // indirect
6970
github.com/gogo/protobuf v1.3.2 // indirect
70-
github.com/golang/glog v1.2.4 // indirect
71+
github.com/golang/glog v1.2.5 // indirect
7172
github.com/golang/protobuf v1.5.4 // indirect
72-
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
73+
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
7374
github.com/google/uuid v1.6.0 // indirect
7475
github.com/gorilla/websocket v1.5.3 // indirect
75-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
7676
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7777
github.com/hashicorp/errwrap v1.1.0 // indirect
7878
github.com/hashicorp/go-multierror v1.1.1 // indirect
79-
github.com/hashicorp/golang-lru v1.0.2 // indirect
8079
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8180
github.com/hashicorp/hcl v1.0.0 // indirect
8281
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
@@ -89,16 +88,16 @@ require (
8988
github.com/ipfs/boxo v0.17.1-0.20240131173518-89bceff34bf1 // indirect
9089
github.com/ipfs/go-block-format v0.2.0 // indirect
9190
github.com/ipfs/go-cid v0.4.1 // indirect
92-
github.com/ipfs/go-datastore v0.6.0 // indirect
91+
github.com/ipfs/go-datastore v0.8.2 // indirect
9392
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
9493
github.com/ipfs/go-ipld-format v0.6.0 // indirect
9594
github.com/ipfs/go-log/v2 v2.5.1 // indirect
9695
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
9796
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
98-
github.com/jbenet/goprocess v0.1.4 // indirect
99-
github.com/k0kubun/pp v3.0.1+incompatible // indirect
97+
github.com/jordanschalm/lockctx v0.0.0-20250412215529-226f85c10956 // indirect
98+
github.com/k0kubun/pp/v3 v3.5.0 // indirect
10099
github.com/kevinburke/go-bindata v3.24.0+incompatible // indirect
101-
github.com/klauspost/compress v1.17.11 // indirect
100+
github.com/klauspost/compress v1.18.0 // indirect
102101
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
103102
github.com/kr/pretty v0.3.1 // indirect
104103
github.com/kr/text v0.2.0 // indirect
@@ -109,12 +108,12 @@ require (
109108
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
110109
github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
111110
github.com/magiconair/properties v1.8.7 // indirect
112-
github.com/mattn/go-colorable v0.1.13 // indirect
111+
github.com/mattn/go-colorable v0.1.14 // indirect
113112
github.com/mattn/go-isatty v0.0.20 // indirect
114-
github.com/mattn/go-runewidth v0.0.15 // indirect
113+
github.com/mattn/go-runewidth v0.0.16 // indirect
115114
github.com/minio/sha256-simd v1.0.1 // indirect
115+
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
116116
github.com/mitchellh/mapstructure v1.5.0 // indirect
117-
github.com/mmcloughlin/addchain v0.4.0 // indirect
118117
github.com/mr-tron/base58 v1.2.0 // indirect
119118
github.com/multiformats/go-base32 v0.1.0 // indirect
120119
github.com/multiformats/go-base36 v0.2.0 // indirect
@@ -127,49 +126,49 @@ require (
127126
github.com/multiformats/go-varint v0.0.7 // indirect
128127
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
129128
github.com/olekukonko/tablewriter v0.0.5 // indirect
130-
github.com/onflow/atree v0.10.0 // indirect
131-
github.com/onflow/bridged-usdc/lib/go/contracts v1.0.0 // indirect
129+
github.com/onflow/atree v0.10.1 // indirect
132130
github.com/onflow/crypto v0.25.3 // indirect
133-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.6.1 // indirect
134-
github.com/onflow/flow-core-contracts/lib/go/templates v1.6.1 // indirect
131+
github.com/onflow/fixed-point v0.1.1 // indirect
132+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.9.0 // indirect
133+
github.com/onflow/flow-core-contracts/lib/go/templates v1.9.0 // indirect
135134
github.com/onflow/flow-evm-bridge v0.1.0 // indirect
136-
github.com/onflow/flow-go v0.41.0-rc.1.0.20250618213905-cfbf84027792 // indirect
137-
github.com/onflow/flow-nft/lib/go/templates v1.2.1 // indirect
138-
github.com/onflow/flow/protobuf/go/flow v0.4.10 // indirect
135+
github.com/onflow/flow-go v0.43.1-rc.5-pr8007.0.20251007165614-c6967df18fa9 // indirect
136+
github.com/onflow/flow-nft/lib/go/templates v1.3.0 // indirect
137+
github.com/onflow/flow/protobuf/go/flow v0.4.16 // indirect
139138
github.com/onflow/go-ethereum v1.15.10 // indirect
140139
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
141140
github.com/onflow/sdks v0.6.0-preview.1 // indirect
142141
github.com/onflow/wal v1.0.2 // indirect
143142
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
144143
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
145-
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
144+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
146145
github.com/pion/dtls/v2 v2.2.12 // indirect
147146
github.com/pion/logging v0.2.2 // indirect
148147
github.com/pion/stun/v2 v2.0.0 // indirect
149148
github.com/pion/transport/v2 v2.2.10 // indirect
150149
github.com/pion/transport/v3 v3.0.7 // indirect
151150
github.com/pkg/errors v0.9.1 // indirect
152151
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
153-
github.com/prometheus/client_golang v1.20.5 // indirect
154-
github.com/prometheus/client_model v0.6.1 // indirect
155-
github.com/prometheus/common v0.61.0 // indirect
156-
github.com/prometheus/procfs v0.15.1 // indirect
152+
github.com/prometheus/client_golang v1.23.2 // indirect
153+
github.com/prometheus/client_model v0.6.2 // indirect
154+
github.com/prometheus/common v0.66.1 // indirect
155+
github.com/prometheus/procfs v0.16.1 // indirect
157156
github.com/psiemens/graceland v1.0.0 // indirect
158157
github.com/psiemens/sconfig v0.1.0 // indirect
159158
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
160-
github.com/rivo/uniseg v0.4.4 // indirect
159+
github.com/rivo/uniseg v0.4.7 // indirect
161160
github.com/rogpeppe/go-internal v1.13.1 // indirect
161+
github.com/schollz/progressbar/v3 v3.18.0 // indirect
162162
github.com/sethvargo/go-retry v0.2.3 // indirect
163163
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
164164
github.com/slok/go-http-metrics v0.12.0 // indirect
165165
github.com/spaolacci/murmur3 v1.1.0 // indirect
166166
github.com/spf13/afero v1.10.0 // indirect
167167
github.com/spf13/cast v1.5.0 // indirect
168-
github.com/spf13/cobra v1.8.1 // indirect
168+
github.com/spf13/cobra v1.10.1 // indirect
169169
github.com/spf13/jwalterweatherman v1.1.0 // indirect
170-
github.com/spf13/pflag v1.0.5 // indirect
170+
github.com/spf13/pflag v1.0.9 // indirect
171171
github.com/spf13/viper v1.15.0 // indirect
172-
github.com/status-im/keycard-go v0.2.0 // indirect
173172
github.com/stretchr/objx v0.5.2 // indirect
174173
github.com/subosito/gotenv v1.4.2 // indirect
175174
github.com/supranational/blst v0.3.14 // indirect
@@ -178,46 +177,46 @@ require (
178177
github.com/tklauser/go-sysconf v0.3.12 // indirect
179178
github.com/tklauser/numcpus v0.6.1 // indirect
180179
github.com/turbolent/prettier v0.0.0-20220320183459-661cc755135d // indirect
181-
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
182-
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
183180
github.com/vmihailenco/msgpack/v4 v4.3.11 // indirect
184181
github.com/vmihailenco/tagparser v0.1.1 // indirect
185182
github.com/wlynxg/anet v0.0.5 // indirect
186183
github.com/x448/float16 v0.8.4 // indirect
187184
github.com/zeebo/blake3 v0.2.4 // indirect
188185
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
189-
go.opentelemetry.io/otel v1.35.0 // indirect
186+
go.opentelemetry.io/otel v1.37.0 // indirect
190187
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
191188
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
192-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
193-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
194-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
189+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
190+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
191+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
195192
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
196193
go.uber.org/atomic v1.11.0 // indirect
197194
go.uber.org/multierr v1.11.0 // indirect
198195
go.uber.org/zap v1.27.0 // indirect
199-
golang.org/x/crypto v0.37.0 // indirect
196+
go.yaml.in/yaml/v2 v2.4.2 // indirect
197+
golang.org/x/crypto v0.41.0 // indirect
200198
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
201-
golang.org/x/net v0.39.0 // indirect
202-
golang.org/x/sync v0.14.0 // indirect
203-
golang.org/x/sys v0.32.0 // indirect
204-
golang.org/x/text v0.24.0 // indirect
205-
golang.org/x/time v0.11.0 // indirect
199+
golang.org/x/net v0.43.0 // indirect
200+
golang.org/x/sync v0.16.0 // indirect
201+
golang.org/x/sys v0.35.0 // indirect
202+
golang.org/x/term v0.34.0 // indirect
203+
golang.org/x/text v0.28.0 // indirect
204+
golang.org/x/time v0.12.0 // indirect
206205
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
207206
gonum.org/v1/gonum v0.16.0 // indirect
208207
google.golang.org/appengine v1.6.8 // indirect
209-
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
210-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
211-
google.golang.org/grpc v1.72.0 // indirect
212-
google.golang.org/protobuf v1.36.6 // indirect
208+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
209+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
210+
google.golang.org/grpc v1.75.1 // indirect
211+
google.golang.org/protobuf v1.36.9 // indirect
213212
gopkg.in/ini.v1 v1.67.0 // indirect
213+
gopkg.in/yaml.v2 v2.4.0 // indirect
214214
gopkg.in/yaml.v3 v3.0.1 // indirect
215-
lukechampine.com/blake3 v1.4.0 // indirect
215+
lukechampine.com/blake3 v1.4.1 // indirect
216216
modernc.org/libc v1.37.6 // indirect
217217
modernc.org/mathutil v1.6.0 // indirect
218218
modernc.org/memory v1.7.2 // indirect
219219
modernc.org/sqlite v1.28.0 // indirect
220-
rsc.io/tmplfunc v0.0.3 // indirect
221220
)
222221

223222
// replace github.com/onflow/flow-nft/lib/go/contracts => ../../../../flow/flow-nft/lib/go/contracts

0 commit comments

Comments
 (0)