Merge branch 'fix-review' into deploy

Author: lmoe

clients/chainclient/chainclient.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math"
 
+	"github.com/iotaledger/bcs-go"
 	"github.com/iotaledger/wasp/clients"
 	"github.com/iotaledger/wasp/clients/apiclient"
 	"github.com/iotaledger/wasp/clients/apiextensions"
@@ -128,13 +129,12 @@ func (c *Client) postSingleRequest(
 		Function: uint32(iscmsg.Target.EntryPoint),
 		Args:     iscmsg.Params,
 	}
-	allowances := iscmove.NewAssets(0)
+	var allowanceBCS []byte
 	if params.Allowance != nil {
-		for coinType, coinBalance := range params.Allowance.Coins.Iterate() {
-			allowances.AddCoin(iotajsonrpc.CoinType(coinType.String()), iotajsonrpc.CoinValue(coinBalance.Uint64()))
-		}
-		for obj := range params.Allowance.Objects.Iterate() {
-			allowances.AddObject(obj.ID, obj.Type)
+		var err error
+		allowanceBCS, err = bcs.Marshal(params.Allowance.AsISCMove())
+		if err != nil {
+			return nil, fmt.Errorf("failed to marshal allowance: %w", err)
 		}
 	}
 	return c.L1Client.L2().CreateAndSendRequestWithAssets(
@@ -145,7 +145,7 @@ func (c *Client) postSingleRequest(
 			AnchorAddress:    c.ChainID.AsAddress().AsIotaAddress(),
 			Assets:           transferAssets,
 			Message:          msg,
-			Allowance:        allowances,
+			AllowanceBCS:     allowanceBCS,
 			OnchainGasBudget: params.GetL2GasBudget(),
 			GasPrice:         params.GetGasPrice(),
 			GasBudget:        params.GetGasBudget(),

clients/iota-go/iotaclient/iotaclienttest/api_exented_test.go

@@ -67,7 +67,7 @@ func TestGetDynamicFieldObject(t *testing.T) {
 
 func TestGetOwnedObjects(t *testing.T) {
 	client := l1starter.Instance().L1Client()
-	signer := iotasigner.NewSignerByIndex(testcommon.TestSeed, iotasigner.KeySchemeFlagEd25519, 0)
+	signer := iotasigner.NewSignerByIndex(testcommon.TestSeed, iotasigner.KeySchemeFlagDefault, 0)
 	t.Run(
 		"struct tag", func(t *testing.T) {
 			structTag, err := iotago.StructTagFromString("0x2::coin::Coin<0x2::iota::IOTA>")

clients/iota-go/iotasigner/iotasignertest/random.go

@@ -14,7 +14,7 @@ func RandomSigner() iotasigner.Signer {
 	if err != nil {
 		panic(err)
 	}
-	return iotasigner.NewSigner(b, iotasigner.KeySchemeFlagIotaEd25519)
+	return iotasigner.NewSigner(b, iotasigner.KeySchemeFlagDefault)
 }
 
 func RandomSignedTransaction(signers ...iotasigner.Signer) iotasigner.SignedTransaction {

clients/iota-go/iotasigner/key_schemes.go

@@ -7,7 +7,7 @@ import (
 
 type KeySchemeFlag byte
 
-var KeySchemeFlagDefault = KeySchemeFlagIotaEd25519
+var KeySchemeFlagDefault = KeySchemeFlagEd25519
 
 const (
 	KeySchemeFlagEd25519 KeySchemeFlag = iota
@@ -17,8 +17,7 @@ const (
 	KeySchemeFlagBLS12381
 	KeySchemeFlagZkLoginAuthenticator
 
-	KeySchemeFlagIotaEd25519 KeySchemeFlag = math.MaxUint8 - 1 // special case for iotago ed25519
-	KeySchemeFlagError                     = math.MaxUint8
+	KeySchemeFlagError = math.MaxUint8
 )
 
 func (k KeySchemeFlag) Byte() byte {

clients/iota-go/iotasigner/signer.go

@@ -18,7 +18,7 @@ type Bip32CoinType int
 const (
 	// testnet/alphanet uses COIN_TYPE = 1
 	TestnetCoinType Bip32CoinType = 1
-	// / IOTA coin type <https://github.com/satoshilabs/slips/blob/master/slip-0044.md>
+	// IOTA coin type <https://github.com/satoshilabs/slips/blob/master/slip-0044.md>
 	IotaCoinType Bip32CoinType = 4218
 )
 
@@ -59,7 +59,6 @@ type Signer interface {
 	SignTransactionBlock(txnBytes []byte, intent Intent) (*Signature, error)
 }
 
-// FIXME support more than ed25519
 type InMemorySigner struct {
 	ed25519Keypair *KeypairEd25519
 
@@ -70,20 +69,14 @@ func NewSigner(seed []byte, flag KeySchemeFlag) *InMemorySigner {
 	prikey := ed25519.NewKeyFromSeed(seed)
 	pubkey := prikey.Public().(ed25519.PublicKey)
 
-	// IOTA_DIFF iotago ignore flag when signature scheme is ed25519
-	var buf []byte
-	switch flag {
-	case KeySchemeFlagEd25519:
-		buf = []byte{KeySchemeFlagEd25519.Byte()}
-	case KeySchemeFlagSecp256k1:
-		buf = []byte{KeySchemeFlagEd25519.Byte()}
-	case KeySchemeFlagIotaEd25519:
-		buf = []byte{}
-	default:
+	// Right now only supports ED25519. Stardust *Addresses* used to include the scheme flag, Rebased does not.
+	// https://docs.iota.org/developer/cryptography/transaction-auth/keys-addresses#address-format
+
+	if flag != KeySchemeFlagEd25519 {
 		panic("unrecognizable key scheme flag")
 	}
-	buf = append(buf, pubkey...)
-	addrBytes := blake2b.Sum256(buf)
+
+	addrBytes := blake2b.Sum256(pubkey)
 	addr := "0x" + hex.EncodeToString(addrBytes[:])
 
 	return &InMemorySigner{
@@ -141,7 +134,6 @@ func (s *InMemorySigner) PublicKey() []byte {
 }
 
 func (s *InMemorySigner) Sign(msg []byte) (signature *Signature, err error) {
-	// FIXME support more than ed25519
 	sig := ed25519.Sign(s.ed25519Keypair.PriKey, msg)
 
 	return &Signature{
@@ -153,7 +145,6 @@ func (s *InMemorySigner) Address() *iotago.Address {
 	return s.address
 }
 
-// FIXME support more than ed25519
 func (s *InMemorySigner) SignTransactionBlock(txnBytes []byte, intent Intent) (*Signature, error) {
 	data := MessageWithIntent(intent, txnBytes)
 	hash := blake2b.Sum256(data)

clients/iota-go/iotasigner/signer_test.go

@@ -14,11 +14,7 @@ import (
 )
 
 func TestNewSigner(t *testing.T) {
-	testIotaAddress := iotago.MustAddressFromHex("0x786dff8a4ee13d45b502c8f22f398e3517e6ec78aa4ae564c348acb07fad7f50")
-	signer, err := iotasigner.NewSignerWithMnemonic(testcommon.TestMnemonic, iotasigner.KeySchemeFlagIotaEd25519)
-	require.NoError(t, err)
-	require.Equal(t, testIotaAddress, signer.Address())
-	signer, err = iotasigner.NewSignerWithMnemonic(testcommon.TestMnemonic, iotasigner.KeySchemeFlagEd25519)
+	signer, err := iotasigner.NewSignerWithMnemonic(testcommon.TestMnemonic, iotasigner.KeySchemeFlagDefault)
 	require.NoError(t, err)
 	require.Equal(t, iotago.MustAddressFromHex(testcommon.TestAddress), signer.Address())
 }

clients/iota-go/iotatest/faucet.go

@@ -13,7 +13,7 @@ func MakeSignerWithFunds(index int, faucetURL string) iotasigner.Signer {
 }
 
 func MakeSignerWithFundsFromSeed(seed []byte, index int, faucetURL string) iotasigner.Signer {
-	keySchemeFlag := iotasigner.KeySchemeFlagIotaEd25519
+	keySchemeFlag := iotasigner.KeySchemeFlagDefault
 
 	// there are only 256 different signers can be generated
 	signer := iotasigner.NewSignerByIndex(seed, keySchemeFlag, index)

clients/iota-go/test_common/consts.go

@@ -2,7 +2,40 @@ package testcommon
 
 const (
 	TestMnemonic = "ordinary cry margin host traffic bulb start zone mimic wage fossil eight diagram clay say remove add atom"
-	TestAddress  = "0xe54d993cf56be93ba0764c7ee2c817085b70f0e6d3ad1a71c3335ee3529b4a48"
+	TestAddress  = "0x786dff8a4ee13d45b502c8f22f398e3517e6ec78aa4ae564c348acb07fad7f50"
 )
 
-var TestSeed = []byte{50, 230, 119, 9, 86, 155, 106, 30, 245, 81, 234, 122, 116, 90, 172, 148, 59, 33, 88, 252, 134, 42, 231, 198, 208, 141, 209, 116, 78, 21, 216, 24}
+var TestSeed = []byte{
+	50,
+	230,
+	119,
+	9,
+	86,
+	155,
+	106,
+	30,
+	245,
+	81,
+	234,
+	122,
+	116,
+	90,
+	172,
+	148,
+	59,
+	33,
+	88,
+	252,
+	134,
+	42,
+	231,
+	198,
+	208,
+	141,
+	209,
+	116,
+	78,
+	21,
+	216,
+	24,
+}

clients/iscmove/isc.go

@@ -222,13 +222,13 @@ func (o ObjectCollection) Iterate() iter.Seq2[iotago.ObjectID, iotago.ObjectType
 }
 
 type Request struct {
-	ID     iotago.ObjectID
-	Sender *cryptolib.Address
-	// XXX balances are empty if we don't fetch the dynamic fields
-	AssetsBag AssetsBagWithBalances // Need to decide if we want to use this Referent wrapper as well. Could probably be of *AssetsBag with `bcs:"optional`
+	ID        iotago.ObjectID
+	Sender    *cryptolib.Address
+	AssetsBag AssetsBagWithBalances
 	Message   Message
-	Allowance Assets
-	GasBudget uint64
+	// AllowanceBCS is either empty or a BCS-encoded iscmove.Allowance
+	AllowanceBCS []byte
+	GasBudget    uint64
 }
 
 type RequestEvent struct {

clients/iscmove/isc_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/iotaledger/wasp/clients/iota-go/iotaclient"
 	"github.com/iotaledger/wasp/clients/iota-go/iotago"
 	"github.com/iotaledger/wasp/clients/iota-go/iotago/iotatest"
-	"github.com/iotaledger/wasp/clients/iota-go/iotajsonrpc"
 	testcommon "github.com/iotaledger/wasp/clients/iota-go/test_common"
 	"github.com/iotaledger/wasp/clients/iscmove"
 	"github.com/iotaledger/wasp/clients/iscmove/iscmoveclient"
@@ -59,11 +58,8 @@ func TestUnmarshalBCS(t *testing.T) {
 				},
 			},
 		},
-		Message: *iscmovetest.RandomMessage(),
-		Allowance: iscmove.Assets{
-			Coins:   iscmove.CoinBalances{iotajsonrpc.IotaCoinType: 100},
-			Objects: iscmove.ObjectCollection{iotago.ObjectID{}: iotago.MustTypeFromString("0x1::a::A")},
-		},
+		Message:   *iscmovetest.RandomMessage(),
+		Allowance: []byte{1, 2, 3},
 		GasBudget: 100,
 	}
 	b, err := bcs.Marshal(&req)
@@ -74,26 +70,3 @@ func TestUnmarshalBCS(t *testing.T) {
 	err = iotaclient.UnmarshalBCS(b, &targetReq)
 	require.Nil(t, err)
 }
-
-func TestUnmarshalInvalidRequestBCS(t *testing.T) {
-	req := iscmoveclient.MoveRequest{
-		ID:     *iotatest.RandomAddress(),
-		Sender: cryptolib.NewAddressFromIota(iotatest.RandomAddress()),
-		AssetsBag: iscmove.Referent[iscmove.AssetsBagWithBalances]{
-			ID: *iotatest.RandomAddress(),
-			Value: &iscmove.AssetsBagWithBalances{
-				AssetsBag: iscmovetest.RandomAssetsBag(),
-				Assets:    *iscmove.NewEmptyAssets(),
-			},
-		},
-		Message: *iscmovetest.RandomMessage(),
-		Allowance: iscmove.Assets{
-			Coins:   iscmove.CoinBalances{"WRONG_TYPE": 100},
-			Objects: iscmove.ObjectCollection{iotago.ObjectID{}: iotago.MustTypeFromString("0x1::a::A")},
-		},
-		GasBudget: 100,
-	}
-	_, err := bcs.Marshal(&req)
-	require.Error(t, err)
-	require.ErrorContains(t, err, "encoding")
-}