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

FEATURE: V2 FungibleToken Standard #131

Merged
merged 122 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
812b131
draft of v2 standard for working group
joshuahannan Mar 22, 2023
f52547a
bring FT v2 up to latest design
joshuahannan May 2, 2023
6e228a3
adds total supply view and updates dependencies
joshuahannan Jul 11, 2023
96cfcde
update FungibleToken.cdc for Stable Cadence
dsainati1 Jun 28, 2023
6531350
integrate stable cadence changes
joshuahannan Jul 18, 2023
d9e2b25
comment out events temp
joshuahannan Jul 18, 2023
b6555eb
add view to structs
joshuahannan Jul 18, 2023
8f0e1d1
use correct import placeholder
joshuahannan Jul 18, 2023
102fac5
remove view modifier from resolveView
joshuahannan Jul 19, 2023
ac3d6fb
add default impl for getSupportedVaultTypes
joshuahannan Jul 19, 2023
288542f
remove default impl for getsupported
joshuahannan Jul 19, 2023
3430bad
add Withdrawable to transfer
joshuahannan Jul 19, 2023
0d4b4a9
remove AnyResource
joshuahannan Jul 26, 2023
b7d2883
update dependencies for stable cadence
joshuahannan Aug 15, 2023
95c819f
WIP updates to transactions for stable cadence
joshuahannan Aug 15, 2023
ab1b03e
comment out default functions and remove Balance
joshuahannan Aug 18, 2023
064ffb3
remove restricted type from link
bjartek Sep 6, 2023
c4a111d
fix merge conflicts from master
joshuahannan Sep 6, 2023
daca660
Merge remote-tracking branch 'origin/v2-standard' into v2-standard
joshuahannan Sep 6, 2023
d501202
Update sdk
SupunS Sep 13, 2023
386ce14
Update contracts
SupunS Sep 20, 2023
f3a52a7
Update to Cadence v1.0.0-preview.1
SupunS Sep 21, 2023
c1363b4
Revert changes to ExampleToken.cdc
SupunS Sep 22, 2023
3a8e7c6
add Cadence test cases for Metadata
sisyphusSmiling Sep 30, 2023
4db8c48
add PrivateReceiverForwarder Cadence tests
sisyphusSmiling Oct 2, 2023
23a7511
consolidate Cadence test directories
sisyphusSmiling Oct 2, 2023
3e98830
bump flow CLI version for ci automation
sisyphusSmiling Oct 2, 2023
78cf9f2
update go assets
sisyphusSmiling Oct 2, 2023
f776fd7
Merge branch 'sisyphusSmiling/cadence-test-framework' into sisyphusSm…
sisyphusSmiling Oct 2, 2023
56c5306
update utility contracts
sisyphusSmiling Oct 17, 2023
14585f5
update ExampleToken-v2 Vault to return TotalSupply view
sisyphusSmiling Oct 17, 2023
347505f
update ExampleToken-v2 init to publish {FungibleToken.Vault} capability
sisyphusSmiling Oct 17, 2023
ba3f9d5
update private forwarder transactions for Cadence 1.0
sisyphusSmiling Oct 17, 2023
58ad55c
update tests/scripts for Cadence 1.0
sisyphusSmiling Oct 17, 2023
61fc175
update go assets
sisyphusSmiling Oct 17, 2023
6d70cf3
update go transaction templates
sisyphusSmiling Oct 17, 2023
a6db1e3
update transactions for Cadence 1.0
sisyphusSmiling Oct 17, 2023
543d4e0
update scripts for Cadence 1.0
sisyphusSmiling Oct 17, 2023
0a7e0f4
bump go version
sisyphusSmiling Oct 18, 2023
decf6f1
add public burn method in ExampleToken-v2
sisyphusSmiling Oct 18, 2023
96c6233
update create_forwarder & generic_transfer txns for Cadence 1.0
sisyphusSmiling Oct 18, 2023
0e2e2a9
update go assets
sisyphusSmiling Oct 18, 2023
b728ef2
add ReceiverPublicPath to ExampleToken-v2 & update go tests + txns
sisyphusSmiling Oct 18, 2023
c88b5cc
update go assets
sisyphusSmiling Oct 18, 2023
f6f74bd
update go assets
sisyphusSmiling Oct 18, 2023
ebef173
rm ExampleToken-v2 dependency on MultipleVaults
sisyphusSmiling Oct 18, 2023
156e4b6
update NonFungibleToken import syntax
sisyphusSmiling Oct 18, 2023
7c8c7e5
update flow config with up to date dependencies
sisyphusSmiling Oct 18, 2023
1e11fdd
update MetadataViews Cadence tests, scripts & txns
sisyphusSmiling Oct 18, 2023
0834d1b
update test_helpers.cdc to Cadence 1.0 syntax
sisyphusSmiling Oct 18, 2023
e8ab90f
update PrivateReceiverForwarder Cadence tests
sisyphusSmiling Oct 18, 2023
add978f
enable FungibleToken.Receiver.getSupportedVaultTypes() in v2 standard…
sisyphusSmiling Oct 18, 2023
d03d0df
update switchboard Cadence tests & supporting scripts & txns
sisyphusSmiling Oct 18, 2023
b10b7b5
update ExampleToken-v2 Cadence tests
sisyphusSmiling Oct 18, 2023
6437458
update go assets
sisyphusSmiling Oct 18, 2023
dc693f7
bump flow cli version to v1.5.0-stable-cadence.3
sisyphusSmiling Oct 18, 2023
7a26563
fix test script bugs & update go assets
sisyphusSmiling Oct 18, 2023
28fc3ba
update example_token_tests
sisyphusSmiling Oct 18, 2023
0b218d8
remove ExampleToken.Minter.mintTokens() pre condition
sisyphusSmiling Oct 19, 2023
766e809
add FT.Vault.getDefaultReceiverPath() method
sisyphusSmiling Oct 20, 2023
d68662a
update ExampleToken.Vault Capability setup & go assets
sisyphusSmiling Oct 20, 2023
0cb177a
rm unused import from ExampleToken-v2
sisyphusSmiling Oct 25, 2023
a1be91b
update NonFungibleToken-v2 implementation from source repo
sisyphusSmiling Oct 25, 2023
bd585d9
fix go GenerateTransferInvalidVaultScript() template txn generation
sisyphusSmiling Oct 25, 2023
5aa68d8
rm test bash script in favor of Makefile
sisyphusSmiling Oct 25, 2023
6c7ce69
fix example_token_tests burn event check
sisyphusSmiling Oct 25, 2023
91dd367
Apply suggestions from code review
sisyphusSmiling Nov 7, 2023
1283415
update ExampleToken-v2.Vault receiverLinkedType + tests & go assets
sisyphusSmiling Nov 7, 2023
6b473c9
Merge branch 'master' into sisyphusSmiling/v2-standard-update
sisyphusSmiling Nov 7, 2023
b2edf2f
update instances of ExampleToken to ExampleToken-v2 in flow.json & tests
sisyphusSmiling Nov 7, 2023
a2f4f3b
Merge pull request #149 from onflow/sisyphusSmiling/v2-standard-update
sisyphusSmiling Nov 7, 2023
b77ea96
remove transfer
joshuahannan Nov 14, 2023
9e68e5a
remove default implementations and move destroy supply update
joshuahannan Nov 21, 2023
a95f9ec
remove transfer event and remove event functions
joshuahannan Dec 1, 2023
a2802ba
remove custom destructor
joshuahannan Dec 12, 2023
22564b4
add event args, global burn method, balance interface, and clean up t…
joshuahannan Jan 9, 2024
c7c36c2
remove path functions and add view function
joshuahannan Jan 11, 2024
00e30ff
remove view modifier, add getIDs
joshuahannan Jan 12, 2024
bd00789
remove view from data view function, updating forwarding events
joshuahannan Jan 16, 2024
aec3a27
add suport for multiple type definitions
joshuahannan Jan 22, 2024
fc1538d
remove get vault types function and add conformance
joshuahannan Jan 22, 2024
5acae21
update dependencies and remove getVaultTypes line
joshuahannan Jan 23, 2024
9f24a73
remove burn method
joshuahannan Jan 23, 2024
3886c24
add burner and add event emission functions
joshuahannan Jan 24, 2024
324e2e3
fix supply update and burner name
joshuahannan Jan 24, 2024
5a1cf77
use conditional downcasting
joshuahannan Jan 24, 2024
44ea944
fix access type
joshuahannan Jan 24, 2024
f30bc72
revert to event emission directly in the pre condition
joshuahannan Jan 24, 2024
01706d1
update sdk and cadence deps
joshuahannan Jan 25, 2024
6d66d29
fix example token, remove getBalance, add isAvailableToWithdraw
joshuahannan Jan 25, 2024
2e80d9b
generate assets
joshuahannan Jan 25, 2024
b0e443d
update transactions to get go tests passing
joshuahannan Jan 31, 2024
58ef81b
sync with master
joshuahannan Jan 31, 2024
9141cd6
add post-condition for vault type
joshuahannan Feb 1, 2024
fd4ce30
remove some go tests
joshuahannan Feb 1, 2024
c4cd3a6
add view functions to Balance and change transactions to use Balance …
joshuahannan Feb 1, 2024
4670592
use Balance and FungibleToken.Vault as public interfaces
joshuahannan Feb 1, 2024
a85b4f9
use correct linked types
joshuahannan Feb 5, 2024
320aa3c
generate assets
joshuahannan Feb 5, 2024
2ab8303
update generic setup and transfer transactions
joshuahannan Feb 9, 2024
959b707
update generic transfer transactions
joshuahannan Feb 13, 2024
29d91e1
update contract borrows and ExampleToken import
joshuahannan Mar 5, 2024
98772c9
update README for v2 standards
joshuahannan Mar 6, 2024
61cf8a0
use correct import placeholder format
joshuahannan Mar 6, 2024
a31032a
update previewnet address
joshuahannan Mar 8, 2024
4f59046
update Burner for optional resources and add tests
joshuahannan Mar 26, 2024
8453adb
revove coverage file
joshuahannan Mar 26, 2024
bd13311
fix imports for standard transactions
joshuahannan Mar 27, 2024
1519d10
add switchboard entitlements and tests
joshuahannan Mar 29, 2024
ae40465
remove old code samples in the README and add links
joshuahannan Mar 29, 2024
ab7b7ac
add pre-condition to createEmptyVault
joshuahannan Apr 2, 2024
a9c3316
update dependencies
joshuahannan Apr 2, 2024
72a9edd
reorganize txs and scripts
joshuahannan Apr 3, 2024
e726af8
add type to TokenForwarding
joshuahannan Apr 5, 2024
fd26c0d
update comment and event test
joshuahannan Apr 12, 2024
263e30a
move withdraw event and add balance after params
joshuahannan Apr 19, 2024
b518689
make event formatting prettier
joshuahannan Apr 19, 2024
f0384c4
add forwarding addresses
joshuahannan Apr 24, 2024
fde295c
Merge remote-tracking branch 'origin/v2-standard' into v2-standard
joshuahannan Apr 24, 2024
3ff4c0f
fix capabilities get in switchboard
joshuahannan Apr 24, 2024
7e9cd20
use contract field and mint event
joshuahannan May 1, 2024
a5ba880
update CLI and emulator deps and tests
joshuahannan May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.18.x'
go-version: '1.20.x'
- uses: actions/cache@v1
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Install Flow CLI
run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.5.0
run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/feature/stable-cadence/install.sh)"
- name: Flow CLI Version
run: flow version
run: flow-c1 version
- name: Update PATH
run: echo "/root/.local/bin" >> $GITHUB_PATH
- name: Run tests
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/release.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
lib/js/test/node_modules/*
node_modules/*
.env
.env
coverage.lcov
coverage.json
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
test:
$(MAKE) generate -C lib/go
$(MAKE) test -C lib/go
flow test --cover --covercode="contracts" tests/*.cdc
flow-c1 test --cover --covercode="contracts" tests/*.cdc

.PHONY: ci
ci:
$(MAKE) ci -C lib/go
flow test --cover --covercode="contracts" tests/*.cdc
flow-c1 test --cover --covercode="contracts" tests/*.cdc
520 changes: 195 additions & 325 deletions README.md
joshuahannan marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

Loading
Loading