fix principal encode

Author: ccyanxyz

ic/agent.py

@@ -16,6 +16,7 @@ def sign_request(req, iden):
         'sender_pubkey': sig[0],
         'sender_sig': sig[1]
     }
+    # print(req_id, envelop, cbor2.dumps(envelop))
     return req_id, cbor2.dumps(envelop)
 
 class Agent:
@@ -54,6 +55,7 @@ def read_state_endpoint(self, canister_id, data):
         return result
 
     def query_raw(self, canister_id, method_name, arg):
+        print(arg)
         req = {
             'request_type': "query",
             'sender': self.identity.sender().bytes,
@@ -71,7 +73,7 @@ def query_raw(self, canister_id, method_name, arg):
         elif result['status'] == 'rejected':
             return result['reject_message']
 
-    def update_raw(self):
+    def update_raw(self, canister_id, method_name, arg):
         req = {
             'request_type': "call",
             'sender': self.identity.sender().bytes,
@@ -82,9 +84,10 @@ def update_raw(self):
         }
         req_id, data = sign_request(req, self.identity)
         _ = self.call_endpoint(canister_id, req_id, data)
+        print('hhh')
         # poll req_id status to get result
-        result = self.poll(canister_id, req_id)
-        print(result)
+        # result = self.poll(canister_id, req_id)
+        # print(result)
 
     def read_state_raw(self, canister_id, paths):
         req = {

ic/candid.py

@@ -45,12 +45,14 @@ def encode_type(t, v):
     elif t == Types.Nat64:
         return int.to_bytes(v, 8, byteorder='big')
     elif t == Types.Principal:
+        tag = int.to_bytes(1, 1, byteorder='big')
+        b = v
         if isinstance(v, str):
-            return Principal.from_str(v).bytes
+            b = Principal.from_str(v).bytes
         elif isinstance(v, Principal):
-            return v.bytes
-        elif isinstance(v, bytes):
-            return v
+            b = v.bytes
+        l = leb128.u.encode(len(b))
+        return tag + l + b
     elif t == Types.Empty:
         return b''
     # TODO: int8, int32, int64, float32, float64, text, ...
@@ -68,6 +70,7 @@ def encode(params):
     for p in params:
         ty += leb128.i.encode(p['type'].value)
         value += encode_type(p['type'], p['value'])
+    print(params, 'types:', ty, 'value:', value)
     data += ty
     data += value
     return data

test_agent.py

@@ -5,14 +5,11 @@
 
 client = Client()
 iden = Identity(privkey="833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42")
-print(iden)
-msg = "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f"
-sig = iden.sign(bytes(bytearray.fromhex(msg)))
-print(sig[1].hex())
+print(Principal.self_authenticating(iden.der_pubkey))
 ag = Agent(iden, client)
 
 # ret = ag.query_raw("gvbup-jyaaa-aaaah-qcdwa-cai", "totalSupply", encode([]))
-ret = ag.query_raw("gvbup-jyaaa-aaaah-qcdwa-cai", "name", encode([]))
+# ret = ag.query_raw("gvbup-jyaaa-aaaah-qcdwa-cai", "name", encode([]))
 '''
 ret = ag.query_raw(
         "gvbup-jyaaa-aaaah-qcdwa-cai",
@@ -21,6 +18,15 @@
             {'type': Types.Principal, 'value': iden.sender().bytes}
         ])
       )
-'''
 print(ret)
+'''
 
+ret = ag.update_raw(
+        "gvbup-jyaaa-aaaah-qcdwa-cai",
+        "transfer",
+        encode([
+            {'type': Types.Principal, 'value': 'aaaaa-aa'},
+            {'type': Types.Nat, 'value': 10000000000}
+            ])
+        )
+print(ret)