@alephium/web3 0.2.0-test.0 → 0.2.0-test.1

package/contracts/add/add.ral

@@ -1,16 +1,13 @@
-import "../sub/sub.ral"
-
-TxContract Add(subContractId: ByteVec, mut result : U256) {
+Contract Add(sub: Sub, mut result : U256) {
     event Add(x: U256, y: U256)
 
     pub fn add(array: [U256; 2]) -> ([U256; 2]) {
-        emit Add(array[0], array[1])
-        let sub = Sub(subContractId)
-        result = result + array[0] + array[1]
-        return [result, sub.sub(array)]
+        return addPrivate(array)
     }
 
     fn addPrivate(array: [U256; 2]) -> ([U256; 2]) {
-        return add(array)
+        emit Add(array[0], array[1])
+        result = result + array[0] + array[1]
+        return [result, sub.sub(array)]
     }
 }

package/contracts/greeter/greeter.ral

@@ -1,7 +1,7 @@
-import "greeter_interface.ral"
-
-TxContract Greeter(btcPrice: U256) implements GreeterInterface {
+Contract Greeter(btcPrice: U256) implements GreeterInterface {
+    @using(readonly = true)
     pub fn greet() -> U256 {
+        checkCaller!(true, 0)
         return btcPrice
     }
 }

package/contracts/greeter/greeter_interface.ral

@@ -1,3 +1,4 @@
 Interface GreeterInterface {
+    @using(readonly = true)
     pub fn greet() -> U256
 }

package/contracts/greeter_main.ral

@@ -1,9 +1,7 @@
-import "./greeter/greeter.ral"
-
-TxScript Main(greeterContractId: ByteVec) {
+TxScript GreeterMain(greeterContractId: ByteVec) {
     let greeter0 = Greeter(greeterContractId)
-    assert!(greeter0.greet() == 1)
+    assert!(greeter0.greet() == 1, 0)
 
     let greeter1 = GreeterInterface(greeterContractId)
-    assert!(greeter1.greet() == 1)
+    assert!(greeter1.greet() == 1, 0)
 }

package/contracts/main.ral

@@ -1,5 +1,3 @@
-import "./add/add.ral"
-
 TxScript Main(addContractId: ByteVec) {
     let add = Add(addContractId)
     add.add([2, 1])

package/contracts/sub/sub.ral

@@ -1,6 +1,7 @@
-TxContract Sub(mut result : U256) {
+Contract Sub(mut result : U256) {
     event Sub(x: U256, y: U256)
 
+    @using(externalCallCheck = false)
     pub fn sub(array: [U256; 2]) -> U256 {
         emit Sub(array[0], array[1])
         result = result + array[0] - array[1]

package/contracts/test/metadata.ral

@@ -0,0 +1,18 @@
+Contract MetaData() {
+    @using(preapprovedAssets = true, assetsInContract = false)
+    pub fn foo() -> () {
+        transferAlph!(callerAddress!(), callerAddress!(), 1 alph)
+        return
+    }
+
+    @using(preapprovedAssets = false, assetsInContract = true)
+    fn bar() -> () {
+        transferAlphToSelf!(selfAddress!(), 1 alph)
+        return
+    }
+
+    @using(readonly = true)
+    fn baz() -> () {
+        return
+    }
+}

package/contracts/test/warnings.ral

@@ -0,0 +1,8 @@
+Contract Warnings(@unused a: U256, b: U256) {
+    const C = 0
+
+    @using(readonly = true)
+    pub fn foo(@unused x: U256, y: U256) -> () {
+        return
+    }
+}