Merge pull request #62 from janezpodhostnik/janez/cadence-1.0

Upgrade to cadence 1.0
janezpodhostnik · Aug 9, 2024 · 7958270 · 7958270
2 parents a41d66b + 99c5610
commit 7958270
Show file tree

Hide file tree

Showing 14 changed files with 1,379 additions and 1,037 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,7 +102,9 @@ jobs:
     needs: test
     services:
       emulator:
-        image: gcr.io/flow-container-registry/emulator:latest
+        #image: gcr.io/flow-container-registry/emulator:latest
+        # temporarily changed because the latest emulator is not 1.0
+        image: gcr.io/flow-container-registry/emulator:v1.0.0-preview.38
         ports:
           - 3569:3569
         env:

diff --git a/examples/account_examples.py b/examples/account_examples.py
@@ -80,8 +80,8 @@ async def run(self, ctx: Config):
         # A test Contract define for this example, you can modify it by your self
         contract = {
             "Name": "TestOne",
-            "source": """pub contract TestOne {
-                                pub fun add(a: Int, b: Int): Int {
+            "source": """access(all) contract TestOne {
+                                access(all) fun add(a: Int, b: Int): Int {
                                     return a + b
                                 }
                                 }""",
@@ -141,8 +141,8 @@ async def run(self, ctx: Config):
         # A test Contract define for this example, you can modify it by your self
         contract = {
             "Name": "TestOne",
-            "source": """pub contract TestOne {
-                                pub fun add(a: Int, b: Int): Int {
+            "source": """access(all) contract TestOne {
+                                access(all) fun add(a: Int, b: Int): Int {
                                     return a + b
                                 }
                                 }""",
@@ -190,8 +190,8 @@ async def run(self, ctx: Config):
             # Updated Contract
             contract = {
                 "Name": "TestOne",
-                "source": """pub contract TestOne {
-                                pub fun add(a: Int, b: Int): Int {
+                "source": """access(all) contract TestOne {
+                                access(all) fun add(a: Int, b: Int): Int {
                                     return a * b
                                 }
                                 }""",
@@ -241,8 +241,8 @@ async def run(self, ctx: Config):
         # A test Contract define for this example, you can modify it by your self
         contract = {
             "Name": "TestOne",
-            "source": """pub contract TestOne {
-                                pub fun add(a: Int, b: Int): Int {
+            "source": """access(all) contract TestOne {
+                                access(all) fun add(a: Int, b: Int): Int {
                                     return a + b
                                 }
                                 }""",

diff --git a/examples/events_examples.py b/examples/events_examples.py
@@ -79,10 +79,10 @@ async def run(self, ctx: Config):
                 ctx=ctx,
                 contracts={
                     "EventDemo": """
-                        pub contract EventDemo {
-                            pub event Add(x: Int, y: Int, sum: Int)
+                        access(all) contract EventDemo {
+                            access(all) event Add(x: Int, y: Int, sum: Int)
 
-                            pub fun add(_ x: Int, _ y: Int) {
+                            access(all) fun add(_ x: Int, _ y: Int) {
                                 let sum = x + y
                                 emit Add(x: x, y: y, sum: sum)
                             }

diff --git a/examples/flow.json b/examples/flow.json
@@ -12,7 +12,7 @@
   "accounts": {
     "emulator-account": {
 			"address": "f8d6e0586b0a20c7",
-			"keys": "39a162b7ea58314c2cda19f32020b3992e9017a0acc5b3ac53ce3a3f8511a877",
+			"keys": "aff3a277caf2bdd6582c156ae7b07dbca537da7833309de88e56987faa2c0f1b",
       "sigAlgorithm": "ECDSA_P256",
       "hashAlgorithm": "SHA3_256"
     }

diff --git a/examples/scripts_examples.py b/examples/scripts_examples.py
@@ -18,7 +18,7 @@ async def run(self, ctx: Config):
         # --------------------------------
         script = Script(
             code="""
-                    pub fun main(): Int {
+                    access(all) fun main(): Int {
                         let a = 1
                         let b = 1
                         return a + b
@@ -54,7 +54,7 @@ async def run(self, ctx: Config):
         # --------------------------------
         script = Script(
             code="""
-                    pub fun main(a: Int, b: Int): Int {
+                    access(all) fun main(a: Int, b: Int): Int {
                         return a + b
                     }
                 """,
@@ -83,10 +83,10 @@ def __init__(self) -> None:
     async def run(self, ctx: Config):
         script = Script(
             code="""
-                    pub struct User {
-                        pub var balance: UFix64
-                        pub var address: Address
-                        pub var name: String
+                    access(all) struct User {
+                        access(all) var balance: UFix64
+                        access(all) var address: Address
+                        access(all) var name: String
 
                         init(name: String, address: Address, balance: UFix64) {
                             self.name = name
@@ -95,7 +95,7 @@ async def run(self, ctx: Config):
                         }
                     }
 
-                    pub fun main(name: String): User {
+                    access(all) fun main(name: String): User {
                         return User(
                             name: name,
                             address: 0x1,

diff --git a/examples/transactions_examples.py b/examples/transactions_examples.py
@@ -205,7 +205,7 @@ async def run(self, ctx: Config):
             transaction = (
                 Tx(
                     code="""transaction {
-                    prepare(signer1: AuthAccount, signer2: AuthAccount) { 
+                    prepare(signer1: &Account, signer2: &Account) { 
                         log(signer1.address) 
                         log(signer2.address)
                     }

diff --git a/flow_py_sdk/cadence/__init__.py b/flow_py_sdk/cadence/__init__.py
@@ -34,6 +34,7 @@
     Function,
     KeyValuePair,
     TypeValue,
+    InclusiveRange,
 )
 from .composite import (
     Struct,
@@ -115,7 +116,15 @@
     ContractInterfaceKind,
     FunctionKind,
     ReferenceKind,
-    RestrictedKind,
+    IntersectionKind,
     CapabilityKind,
     EnumKind,
+    InclusiveRangeKind,
+    EntitlementConjunctionSetKind,
+    EntitlementDisjunctionSetKind,
+    EntitlementMapAuthorization,
+    EntitlementUnauthorizedKind,
+    EntitlementMapKind,
+    EntitlementKind,
+    EntitlementsKind,
 )
diff --git a/flow_py_sdk/cadence/constants.py b/flow_py_sdk/cadence/constants.py
@@ -13,14 +13,19 @@
 identifierKey = "identifier"
 staticTypeKey = "staticType"
 addressKey = "address"
-pathKey = "path"
 initializersKey = "initializers"
 labelKey = "label"
 parametersKey = "parameters"
 returnKey = "return"
-authorizedKey = "authorized"
-restrictionsKey = "restrictions"
+authorizationKey = "authorization"
+typesKey = "types"
 functionTypeKey = "functionType"
+elementKey = "element"
+startKey = "start"
+endKey = "end"
+stepKey = "step"
+purityKey = "purity"
+entitlementsKey = "entitlements"
 
 voidTypeStr = "Void"
 optionalTypeStr = "Optional"
@@ -57,6 +62,7 @@
 linkTypeStr = "Link"
 pathTypeStr = "Path"
 typeTypeStr = "Type"
+inclusiveRangeTypeStr = "InclusiveRange"
 capabilityTypeStr = "Capability"
 functionTypeStr = "Function"